Fix bug with registration
Merge branch 'dev' of https://github.com/eliasbagley/tokenym_server into dev

Conflicts:
	dump.rdb