Merge pull request #25 from milneti/master

Update local branch
Merge pull request #26 from milneti/master

Pull from Master
Merge remote-tracking branch 'origin/Huys_Branch'
Transaction Activity 3 Commit
Merge pull request #27 from milneti/Huys_Branch

Huys branch
updated AccountCreation.php

login info is bogus, but script has been corrected to insert
RFrost@fakemail.com, Robert, Frost, thisisthepasswor into the database.

It should be noted that password field maximum length may be too
limited.

We'll need to revisit the userid incrementation because it seems to
increment even on failed attempts.
Merge branch 'master' of https://github.com/milneti/PayBack
updated scrum doc
Merge branch 'master' of https://github.com/milneti/PayBack
ignore
Revert "ignore"

This reverts commit 6f2bbd925d73a96b15b9379e79b96bd1f909ffc5.
edited to correct query
Transaction page changes

	new file:   PayBack - CEN3031 Scrum.xlsx
	new file:   PayBack/Thumbs.db
	modified:   PayBack/res/layout/activity_transaction3.xml
	modified:   PayBack/res/layout/activity_transaction4.xml
	new file:   PayBack/res/layout/activity_transaction4_listviewitem.xml
	modified:   PayBack/res/layout/activity_transaction5.xml
	modified:   PayBack/src/com/example/payback/Transaction1Activity.java
	modified:   PayBack/src/com/example/payback/Transaction3Activity.java
	modified:   PayBack/src/com/example/payback/Transaction4Activity.java
	modified:   PayBack/src/com/example/payback/Transaction5Activity.java
Merge pull request #28 from milneti/ArnavTestBranch

Arnav test branch
ignre
Revert "ignre"

This reverts commit 6f7af2f6f2f0215f50d044a4b3a53613f4399834.
corrected inputs from test data
Final scrum doc commit for sprint 2
Presentation
Placeholder
	deleted:    PayBack - CEN3031 Scrum.xlsx
	modified:   PayBack/AndroidManifest.xml
	modified:   PayBack/res/layout/activity_contact.xml
	new file:   PayBack/res/layout/activity_shortcuts.xml
	modified:   PayBack/res/layout/activity_transaction2_expandablecontactlist_main.xml
	new file:   PayBack/res/layout/custom_title_bar.xml
	modified:   PayBack/res/layout/dialog_confirm_contact.xml
	new file:   PayBack/res/menu/shortcuts.xml
	new file:   PayBack/res/menu/title.xml
	modified:   PayBack/res/values/strings.xml
	modified:   PayBack/res/values/styles.xml
	modified:   PayBack/src/com/example/payback/ContactActivity.java
	modified:   PayBack/src/com/example/payback/CreateAccountActivity.java
	modified:   PayBack/src/com/example/payback/MainActivity.java
	modified:   PayBack/src/com/example/payback/ManageGroupActivity.java
	modified:   PayBack/src/com/example/payback/NotificationActivity.java
	modified:   PayBack/src/com/example/payback/ResolveTransactionActivity.java
	modified:   PayBack/src/com/example/payback/SettingsActivity.java
	new file:   PayBack/src/com/example/payback/ShortcutsActivity.java
	modified:   PayBack/src/com/example/payback/StatisticActivity.java
	new file:   PayBack/src/com/example/payback/TitleActivity.java
	new file:   PayBack/src/com/example/payback/TitleBar.java
	modified:   PayBack/src/com/example/payback/Transaction1Activity.java
	modified:   PayBack/src/com/example/payback/Transaction3Activity.java
	modified:   PayBack/src/com/example/payback/Transaction4Activity.java