fix grunt errors
Merge branch 'persistence' into usermanager
first application