:(
Merge branch 'master' of
https://github.com/Quasineation/parking-inspector-client.git

Conflicts:
	www/js/core-project.js