fix registration, activation and recovery password
Merge branch 'master' of github.com:cwmb/clanwars
fix conflict