fixed current users for heroku
Merge branch 'herokuUsers2'
resolving conflicts