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