Fixes the issues reported by @danbev with names on 
Google Authenticator
Merge branch 'abstractj-AEROGEAR-934'