Adding build task
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
Moving CMS in to core
Adding CMS.init
Adding logging