Updated to add stuff
Merge branch 'master' of https://github.com/cxmark/park-and-cycle-source

Conflicts:
	ui/js/app/app.js
	ui/js/app/app.min.js
Merge branch 'master' of https://github.com/cxmark/park-and-cycle-source