Updated versions
Fixed registration and added city to registration form
Merge branch 'master' into release