Added emails to registration and the database.
Merge remote-tracking branch 'origin'

Conflicts:
	res/values/strings.xml
	src/android/cs2340/model/User.java
	src/android/cs2340/persistence/UserDataTable.java
	src/android/cs2340/tests/DanielsUserTest.java
	src/android/cs2340/tests/TiffsAccountTest.java