set up proper build, corrected gruntfile, now building and deploying to /resources/app.
upstream merge