final
Merge branch 'master' of https://github.com/Grapheme/krepostnoy100

Conflicts:
	app/about.html
	app/company.html
	app/contacts.html
	app/index.html
	app/layout.html
	app/layout.jade
	app/layouts.html
	app/location.html
	app/mortgage.html
	app/news.html