refactor app.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebActivities/css/app.css
	WebActivities/js/controllers.js
	WebActivities/partials/searchPanel.html
refactor app.json