Added User Name implementation and 'sign up types' map support.
Merge branch 'master' of github.com:ciyam/ciyam