Fixed register
Merge branch 'master' of github.com:/Hyperactivity/android-app

Conflicts:
	res/values/strings.xml