DL-31 Catching exception in case user already exists
DL-31 Error message in case of different email when registering
DL-31 Finalizing checks on registration
DL-20 Provide all user info with additional api
DL-20 Remove hardcoded addresses
Merge branch 'master' into register_user

Conflicts:
	lib/casserver/authenticators/sql_encrypted.rb
	lib/casserver/server.rb
	locales/de.yml
	locales/en.yml
	locales/es.yml
	locales/es_ar.yml
	locales/fr.yml
	locales/it.yml
Merge branch 'register_user'
add token on cas login
add webstore token on cas registration
Merge pull request #5 from Navionics/webstore_token_support

Webstore token support
try to fix cors problem
add cross-origin gem on Gemfile
try to fix cors 2
try cors again
add final cors patch on the project
Revert "Merge pull request #5 from Navionics/webstore_token_support"

This reverts commit df2f8a4958c238b31dd6af8094819c0a5218dabe, reversing
changes made to 3cce0274650ef5491cc67ad74e9cc3393581678d.
DL-60 Introduce registration validation
Merge branch 'register_validations' into development