added username for app
Merge branch 'master' into deploy