Started work on frontend for logging in and regestering users
linked to database
fixed conflict in ForgotPassword.java
linked ForgotPassword.java to database
Merge branch 'master' into story5

Conflicts:
	res/layout/activity_main.xml
	src/com/teambitcoin/coinwallet/ForgotPassword.java
	src/com/teambitcoin/coinwallet/MainActivity.java
Fix merge conflict
Merge branch 'master' into story5

Conflicts:
	src/com/teambitcoin/coinwallet/ForgotPassword.java
fixed errors introduced by others, updated ForgotPassword, created ForgotPasswordTest
Added generateAccount method which creates an API account object
Cleared dummy list, trying to make it work with the real methods
More merge conflicts
Needing pull update
Fix merge conflicts
Clean up
Merge fix and archive integration