Merge pull request #31 from lvl0nax/dev

master
Merge pull request #34 from lvl0nax/dev

bug fixes
Merge pull request #35 from Neodelf/bugs

main page
Merge branch 'master' of github.com:lvl0nax/topaza
cosmetic fixes
cosmetic fixes for main body header
cosmetic fixes
try add lang to ckeditor
cosmetic fixes
try to fix ckeditor
try to fix ckeditor
try to fix ckeditor
try to fix ckeditor
test js.coffee
Merge branch 'master' of github.com:lvl0nax/topaza into bugs

Conflicts:
	app/assets/stylesheets/css_folders/contacts.css.scss