add branch alias
update base module, add development config handling
add assets management via AssetManager and bower
minor fixes
update gitignore
add branch alias
Merge branch 'develop'

Conflicts:
	composer.json