Pulling develop
Merge branch 'develop' of codebasehq.com:playgen/celar/datacon into develop

Conflicts:
	www-src/app/views/activitymonitor.html
	www-src/app/views/charts.html
	www-src/app/views/charts/info.html
	www-src/app/views/search.html
Merge branch 'develop'