Merge branch 'master' into dev
added modules support for child
module loader works
added basic files
removed sidebar from page-home
Merge branch 'master' into dev

Conflicts:
	child.js
fixed issue
added child module loader
Merge branch 'dev'
removed debug code and added to version
Merge branch 'dev'
removed page-homepage