Dan M8

changed date formatting and other stuff
Merge remote-tracking branch 'origin/backup(daniels)' into CODE-M6-HERE

Conflicts:
	bin/CS-2340-Water-s-Warriors.apk
	bin/classes.dex
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$id.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$layout.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$menu.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$string.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$style.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$styleable.class
	bin/classes/cs2340/android/Activities/AccountActivity.class
	bin/classes/cs2340/android/Activities/AddAccountActivity.class
	bin/classes/cs2340/android/Activities/LoginActivity.class
	bin/classes/cs2340/android/Activities/RegisterActivity.class
	bin/classes/cs2340/android/Activities/TransactionActivity.class
	bin/classes/cs2340/android/Activities/UserPageActivity.class
	bin/classes/cs2340/android/Model/Account.class
	bin/classes/cs2340/android/Model/AccountModel.class
	bin/classes/cs2340/android/Model/Deposit.class
	bin/classes/cs2340/android/Model/TransactionInterface.class
	bin/classes/cs2340/android/Model/Withdrawl.class
	bin/classes/cs2340/android/Presenters/AccountPresenter.class
	bin/classes/cs2340/android/Views/AccountPageView.class
	bin/resources.ap_
	gen/cs2340/andriod/cs_2340_water_s_warriors/R.java
	res/layout/activity_account.xml
	res/layout/activity_transaction.xml
	res/values/strings.xml
	src/cs2340/android/Model/Account.java
	src/cs2340/android/Model/TransactionInterface.java
Merge branch 'CODE-M6-HERE' of https://github.com/shadowfiles/CS-2340-Water-s-Warriors into CODE-M6-HERE

Conflicts:
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$id.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$string.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$style.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$styleable.class
	bin/classes/cs2340/android/Activities/AccountActivity.class
	bin/classes/cs2340/android/Activities/AddAccountActivity.class
	bin/classes/cs2340/android/Activities/LoginActivity.class
	bin/classes/cs2340/android/Activities/RegisterActivity.class
	bin/classes/cs2340/android/Activities/SpendingReportParametersActivity.class
	bin/classes/cs2340/android/Activities/TransactionActivity.class
	bin/classes/cs2340/android/Model/Account.class
	bin/classes/cs2340/android/Model/AccountModel.class
	bin/classes/cs2340/android/Model/Deposit.class
	bin/classes/cs2340/android/Model/TransactionInterface.class
	bin/classes/cs2340/android/Model/Withdrawl.class
	bin/classes/cs2340/android/Presenters/AccountPresenter.class
	bin/classes/cs2340/android/Views/AccountPageView.class
	gen/cs2340/andriod/cs_2340_water_s_warriors/R.java
	res/values/strings.xml
	src/cs2340/android/Model/Account.java
	src/cs2340/android/Model/AccountModel.java
got Rebecca's
M8 corrections and other

Signed-off-by: Daniel Shea <sadsheady@gmail.com>