Made changes to get core working.
Merge branch 'master' of https://github.com/jcadruvi/Core
Made changes for core content and scripts.