All Activities Added
Merge branch 'master' of https://github.com/dcashman/BillSplit.git

Conflicts:
	BillSplit/AndroidManifest.xml
	BillSplit/res/values/strings.xml
	BillSplit/src/billsplit/ui/EventMainActivity.java
	BillSplit/src/billsplit/ui/TransactionActivity.java
Merge branch 'master' of https://github.com/dcashman/BillSplit.git
syntax fix