Merge branch 'master' into Huys_Branch
trying to overhaul from checkbox to expandable list for future use
countinuing to work on the overhaul
implemented expandable without checkboxs

Finished adding expandablelist so that we can have groups and contacts.
Still need to to add the buttons back and combining it with checkboxs
Merge branch 'master' into Huys_Branch

Conflicts:
	PayBack/res/layout/activity_transaction2.xml
	PayBack/res/layout/activity_transaction2_contactlist.xml
	PayBack/src/com/example/payback/Transaction2Activity_contactlist.java
	PayBack/src/com/example/payback/User.java
changed to 2.3.3
Merge pull request #19 from milneti/Create-Account-Activity

Create account activity and transitioning between login and create account activity
implemented list in the contact list

still have a bug with diolog boxes but otherwise is there now
updating master to huy's branch
Finished debugging list in contacts. fully implemented

dialog boxes are still broken
Some work on the settings page
step 1 on combining expandable list and checkbox
about halfway through combining checkboxes and expandable list

still have checkbox cycle bug and still need to make it a list of friend
rather then strings to pass on the data properly
merging master into huybranch
fixing conficts
fixing conficts
Changed some dummy friends and changed it to hold friends in Trans2 rather then Strings directly

Still have bugs with select cycling. still working on connecting
checkbox to selection to pass the data
finished fixing the checkboxes

still need to get data from the "user" and pass data on but checkboxes
will change the boolean value of a list of friends. just need to seach
for friends with a true boolean and pass that on.
Merge branch 'Huys_Branch'
Merge pull request #22 from milneti/master

Getting changes from Master