update
Merge branch 'master' of https://github.com/BinaryStudio/hackathon

Conflicts:
	templates/parking/control.html