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

Conflicts:
	app/view/js/bolt.js
Minor alignment to be synced with our convention and points $this->root to root of whole project
Style
Reverting back tests its previous state, mainly using basepath for invoking ResourceManager
root should be calculated relative from 'vendor'
Merge pull request #1826 from rixbeck/comp-loader

Minor alignment in $root when ResourceManager instantiated with classloader