cleaning and overall structure changes (json files into json) Controllers, Services in separate files
Merge branch 'master' of https://github.com/DataAnalyticsinStudentHands/PublicArtApp

Conflicts:
	www/index.html mine
	www/js/app.js mine
	www/js/controllers.js mine
	www/templates/tours.html their