Added registration options
Removed duplicate name in views
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of http://github.com/Subho-bcrec/kickchat