fix #5
Merge branch 'develop' of github.com:yuruga/edisonhack into feature/#5

Conflicts:
	main.js
fix #5
Merge branch 'develop' of github.com:yuruga/edisonhack into feature/#5

Conflicts:
	libs/CarService.js
Merge branch 'feature/#5' into develop