Folder Structure update

Folders added to solve Grunt.js problem, where it hangs cause it can't find proper folders.
Core folder update
Merge branch 'master' into dev
GitIgnore update