Fix problem after last merge
Merge branch 'master' of github.com:jritter/AdminApp