Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-08

changed frontend/public/views/appList.html
changed frontend/public/views/appListRules.html
changed frontend/public/views/appRules.html
changed frontend/public/views/appView.html
changed frontend/public/views/createApp.html
changed frontend/public/views/editRule.html
changed frontend/public/views/notificationStatistics.html
frontend/public/views/appList.html Diff Switch to side-by-side view
Loading...
frontend/public/views/appListRules.html Diff Switch to side-by-side view
Loading...
frontend/public/views/appRules.html Diff Switch to side-by-side view
Loading...
frontend/public/views/appView.html Diff Switch to side-by-side view
Loading...
frontend/public/views/createApp.html Diff Switch to side-by-side view
Loading...
frontend/public/views/editRule.html Diff Switch to side-by-side view
Loading...
frontend/public/views/notificationStatistics.html Diff Switch to side-by-side view
Loading...