4
Merge branch 'master' of https://github.com/SevaMAN/gearage

Conflicts:
	static/src/app/app.js
	static/src/app/initialize.js
	static/src/app/styles/app.less
	static/src/app/templates.js
	static/src/bower.json
	static/src/config.coffee