removed depricated init() function
updated default cms
Merge remote-tracking branch 'origin/1.0-develop' into 1.0-scratchpad
updated core files
Merge remote-tracking branch 'origin/1.0-develop' into 1.0-develop

Conflicts:
	composer.lock