styles
Merge branch 'master' of https://github.com/ukrlogic/color_travel

Conflicts:
	src/Application/UkrLogic/MainBundle/Resources/public/js/template.js