Moved web stuff out
Merge branch 'master' of https://github.com/SmarterCities/SmarterCities

Conflicts:
	.DS_Store
	api.php
	index.php
	style.css
	website/application.php