Updated app and gruntfile