Modified .gitignore to follow new files structure
Migrated to grunt build
Built release version
Merge branch 'dev'