new

i fixed that black pop ups and i added your code but when i tested it
out it always says that the email wasnt sent. i tried to fix it but
couldnt figure it out. i took out the edit profile from the spinner
since we have nothing for it.
Merge branch 'uclick1.1' of https://github.com/LalaP/BrainTeasers into uclick1.1

Conflicts:
	UClick/bin/classes/com/cs365/uclick/PasswordActivity.class
	UClick/bin/classes/com/cs365/uclick/R$id.class
	UClick/bin/classes/com/cs365/uclick/R$layout.class
	UClick/bin/classes/com/cs365/uclick/R$menu.class
	UClick/bin/classes/com/cs365/uclick/R$string.class
	UClick/bin/classes/com/cs365/uclick/R$style.class
	UClick/bin/classes/com/cs365/uclick/RegisterActivity.class