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'
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
Merge branch 'master' of https://github.com/milneti/PayBack
Updated Doc
	modified:   PayBack - CEN3031 Scrum.xlsx
Updated sprint 2 doc again
Updated Scrum Doc
	modified:   PayBack - CEN3031 Scrum.xlsx
Merge Master

	modified:   PayBack - CEN3031 Scrum.xlsx
Merge pull request #18 from milneti/master

Sync with master