Working on Trans 2
Merge branch 'master' into Huys_Branch

Conflicts:
	PayBack/src/com/example/payback/User.java
Merge branch 'master' into Huys_Branch

Conflicts:
	PayBack/src/com/example/payback/User.java
working on trans 2

added a way of selecting v01
finished adding a basic contact selection

transaction page 2 can now add contacts. I haven't implemented the
friend list but if you go through, it's really easy to add new contacts
to the list. it can probably be added with a forloop once we finish the
user class a bit more
Merge branch 'Huys_Branch'
contact page sequence updates
Merge remote-tracking branch 'origin/master' into T-Branch

Conflicts:
	PayBack/res/values/strings.xml
Revert "cleaned up some code"

This reverts commit e10ce94f3d32ce1b2c0f337184b59cc5f822a08b.

Conflicts:
	PayBack/res/values/strings.xml
Revert "Revert "cleaned up some code""

This reverts commit b9e1d9c1b9c9312b038e8813f943219617c8ff13.
Major changes

	modified:   PayBack - CEN3031 Scrum.xlsx
	modified:   PayBack/AndroidManifest.xml
	modified:   PayBack/project.properties
	modified:   PayBack/res/layout/activity_contact.xml
	deleted:    PayBack/res/layout/activity_create_contact.xml
	modified:   PayBack/res/layout/activity_login.xml
	modified:   PayBack/res/layout/activity_main.xml
	modified:   PayBack/res/layout/activity_transaction1.xml
	modified:   PayBack/res/layout/activity_transaction2.xml
	modified:   PayBack/res/layout/activity_transaction3.xml
	modified:   PayBack/res/layout/activity_transaction4.xml
	modified:   PayBack/res/layout/activity_transaction5.xml
	modified:   PayBack/res/menu/contact.xml
	modified:   PayBack/res/menu/create_contact.xml
	modified:   PayBack/res/menu/create_transaction.xml
	modified:   PayBack/res/menu/login.xml
	modified:   PayBack/res/menu/main.xml
	modified:   PayBack/res/menu/manage_group.xml
	modified:   PayBack/res/menu/notification.xml
	modified:   PayBack/res/menu/resolve_transaction.xml
	modified:   PayBack/res/menu/statistic.xml
	modified:   PayBack/res/menu/transaction1.xml
	modified:   PayBack/res/menu/transaction2.xml
	modified:   PayBack/res/menu/transaction3.xml
	modified:   PayBack/res/menu/transaction4.xml
	modified:   PayBack/res/menu/transaction5.xml
	modified:   PayBack/res/values-v11/styles.xml
	modified:   PayBack/res/values-v14/styles.xml
	modified:   PayBack/res/values/strings.xml
	modified:   PayBack/res/values/strings_activity_settings.xml
	modified:   PayBack/res/xml/pref_headers.xml
	modified:   PayBack/src/com/example/payback/ContactActivity.java
	modified:   PayBack/src/com/example/payback/LoginActivity.java
	renamed:    PayBack/src/com/example/payback/CreateContact.java -> PayBack/src/com/example/payback/SettingsActivity.java
	modified:   PayBack/src/com/example/payback/Transaction1Activity.java
	modified:   PayBack/src/com/example/payback/Transaction2Activity_contactlist.java
More changes

	new file:   PayBack/res/layout/activity_settings.xml
	new file:   PayBack/res/layout/dialog_create_contact.xml
	new file:   PayBack/res/menu/settings.xml
	new file:   ~$PayBack - CEN3031 Scrum.xlsx
Remove old scrum doc

	deleted:    PayBack - CEN3031 Scrum.xlsx
Updated Scrum Doc
Merge branch 'master' of https://github.com/milneti/PayBack

 Merge changes to Master
	modified:   PayBack/res/layout/activity_transaction1.xml
	deleted:    PayBack/res/layout/activity_transaction2.xml
	modified:   PayBack/res/layout/activity_transaction2_contactlist.xml
	new file:   PayBack/res/layout/activity_transaction2_footer.xml
	new file:   PayBack/res/layout/activity_transaction2_header.xml
	modified:   PayBack/res/layout/activity_transaction5.xml
	modified:   PayBack/res/values/strings.xml
	modified:   PayBack/src/com/example/payback/Transaction2Activity.java
	renamed:    PayBack/src/com/example/payback/Transaction2Activity_contactlist.java -> PayBack/src/com/example/payback/Transaction2Activity_contactlist_adapter.java
	modified:   PayBack/src/com/example/payback/User.java
More adapting to android 2.3.3. Removed accidental comment-out of some code.

	modified:   PayBack/res/layout/activity_transaction2_footer.xml
	modified:   PayBack/src/com/example/payback/Transaction2Activity_contactlist_adapter.java
Updated Scrum doc
minor edit
PHP template wip
Implement Lougout button w/ history deletion

	modified:   PayBack/res/layout/activity_contact.xml
	modified:   PayBack/res/layout/activity_main.xml
	modified:   PayBack/src/com/example/payback/MainActivity.java
	modified:   PayBack/src/com/example/payback/Transaction5Activity.java