Line endings / merge
Merge branch 'master-org' into master-my

Conflicts:
	app/view/js/bolt.js
Update to CKEditor 4.4.5 with codesnippet plugin
Add JS for optional codesnippet button
Don't use CK's config.js
Comments
Refactord %contentype%/%contentypes% replacement a bit
Removed unused variables
Optimized searching for __() in twig
Comments
Use switch instead of two ifs+fnc for twig/php selection
Renamed single char variable to something meaningful
Comments
Added Translation class
Minor alignment to be synced with our convention and points $this->root to root of whole project
Moved gatherTranslatableStrings() from lib.php to Translation::gatherTranslatableStrings()
Moved inline function $getTranslated() to Translation::getTranslated()
Style
Reverting back tests its previous state, mainly using basepath for invoking ResourceManager
root should be calculated relative from 'vendor'