Merge pull request #25 from milneti/master

Update local branch
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
pull

	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/Transaction2Activity.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
	new file:   PayBackDB/PHP/AccountCreation.php
	new file:   PayBackDB/PHP/AccountLogin.php
	new file:   PayBackDB/PHP/AccountLookup1var.php
	new file:   PayBackScrum2Presentation.pptx
Full Merge. Contacts/TransactionPages/modifications/etc.
	modified:   PayBack/AndroidManifest.xml
	modified:   PayBack/res/layout/activity_shortcuts.xml
	modified:   PayBack/res/layout/activity_transaction1.xml
	modified:   PayBack/res/layout/activity_transaction2_expandablecontactlist_main.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/values/strings.xml
	modified:   PayBack/res/values/strings_activity_login.xml
	modified:   PayBack/res/values/styles.xml
	modified:   PayBack/src/com/example/payback/LoginActivity.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
	modified:   PayBack/src/com/example/payback/ShortcutsActivity.java
	modified:   PayBack/src/com/example/payback/StatisticActivity.java
	modified:   PayBack/src/com/example/payback/TitleActivity.java
	modified:   PayBack/src/com/example/payback/Transaction1Activity.java
	modified:   PayBack/src/com/example/payback/Transaction2Activity.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 #31 from milneti/T-Branch

Update Local Branch
Minor Updates
Merge pull request #32 from milneti/master

Update Local Branch
Merge branch 'master' into Huys_Branch
currently working trans 4 and fixing bugs of trans 3
setup trans page 4 ui and worked on the intents
trans 4 now formats. still doesn't store values

sliders are decorative for now
data now pass to page 5 from a listview of edittext

still has no built in limitations so borrowers can borrow more then the
total transaction
update
Transaction 4 is mostly done

still has a placeholder error for money but passes data if satisfied
Merge branch 'master' into Huys_Branch
Merge branch 'Huys_Branch'
ignore
Revert "ignore"

This reverts commit ba35e7e4779b433c0fb1dc50f99e692da537f3a7.