Merge pull request #18 from milneti/master

Sync with master
Updates
	modified:   PayBack - CEN3031 Scrum.xlsx
	modified:   PayBack/res/layout/activity_contact.xml
	modified:   PayBack/res/layout/activity_transaction3.xml
	modified:   PayBack/res/values/strings.xml
	modified:   PayBack/src/com/example/payback/ContactActivity.java
	modified:   PayBack/src/com/example/payback/MainActivity.java
local fix
	deleted:    PayBack - CEN3031 Scrum.xlsx
Merge branch 'T-Branch' of https://github.com/milneti/PayBack into T-Branch

Conflicts:
	PayBack - CEN3031 Scrum.xlsx
	PayBack/res/layout/activity_contact.xml

	modified:   PayBack/res/layout/activity_contact.xml
	modified:   PayBack/res/layout/activity_main.xml
	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
	new file:   PayBack/res/layout/dialog_confirm_contact.xml
	modified:   PayBack/res/values/strings.xml
	modified:   PayBack/src/com/example/payback/MainActivity.java
	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/Transaction5Activity.java
	modified:   PayBack/src/com/example/payback/User.java
	new file:   PayBackDB/PHP/J2P2S Template.php
Merge branch 'master' of https://github.com/milneti/PayBack
Conflicts resolved

	new file:   PayBack - CEN3031 Scrum.xlsx
	modified:   PayBack/AndroidManifest.xml
	modified:   PayBack/res/layout/activity_contact.xml
	new file:   PayBack/res/layout/activity_contact_iteminlist.xml
	new file:   PayBack/res/layout/activity_create_account.xml
	modified:   PayBack/res/layout/activity_login.xml
	modified:   PayBack/res/layout/activity_settings.xml
	modified:   PayBack/res/layout/activity_transaction1.xml
	deleted:    PayBack/res/layout/activity_transaction2_contactlist.xml
	new file:   PayBack/res/layout/activity_transaction2_expandablecontactlist_group.xml
	new file:   PayBack/res/layout/activity_transaction2_expandablecontactlist_item.xml
	new file:   PayBack/res/layout/activity_transaction2_expandablecontactlist_main.xml
	deleted:    PayBack/res/layout/activity_transaction2_footer.xml
	deleted:    PayBack/res/layout/activity_transaction2_header.xml
	modified:   PayBack/res/layout/activity_transaction3.xml
	modified:   PayBack/res/layout/activity_transaction4.xml
	deleted:    PayBack/res/layout/dialog_create_contact.xml
	new file:   PayBack/res/menu/create_account.xml
	modified:   PayBack/res/values/strings.xml
	modified:   PayBack/res/values/strings_activity_login.xml
	modified:   PayBack/src/com/example/payback/ContactActivity.java
	new file:   PayBack/src/com/example/payback/CreateAccountActivity.java
	modified:   PayBack/src/com/example/payback/LoginActivity.java
	modified:   PayBack/src/com/example/payback/MainActivity.java
	modified:   PayBack/src/com/example/payback/Transaction1Activity.java
	modified:   PayBack/src/com/example/payback/Transaction2Activity.java
	deleted:    PayBack/src/com/example/payback/Transaction2Activity_contactlist_adapter.java
	new file:   PayBack/src/com/example/payback/Transaction2Activity_expandablecontactlist_adapter.java
	modified:   PayBack/src/com/example/payback/Transaction3Activity.java
	modified:   PayBack/src/com/example/payback/Transaction5Activity.java
	modified:   PayBack/src/com/example/payback/User.java
	new file:   PayBackDB/HTML/index.html
	modified:   PayBackDB/MyDB.sql
	modified:   PayBackDB/PHP/J2P2S Template.php
	new file:   PayBackDB/TEST.sql
	new file:   PayBackDB/UPDATE.sql