Fixed ember folders, added user model template, added .idea folder in .gitignore file
Merge branch 'develop' of github.com:Infinity-Code/inner-heaven-server into develop
Merge remote-tracking branch 'origin/develop' into develop