Stylovky 2014
Stylovky 2014
Merge origin/master

Conflicts:
	css/screen.css
	css/screen.css.map
	css/screen.scss