fixed login validation
fixed merge conflicts with closeTopModal
Merge branch 'master' of github.com:255/catan
fixed merge conflict in playerwaitingcontroller
register validation
Merge branch 'master' of github.com:255/catan