README.md
readded frontend build
updated Gruntfile
Merge branch 'master' into loginAndres