Update gems for testing
Prettify user form
Merge branch 'master' into stable