Merge branch 'master' of https://github.com/AllPlayers/allplayers-android
Merge branch 'master' of https://github.com/AllPlayers/allplayers-android
Saving progress.
Added files for the beginning of the messaging.
Merge branch 'addComposeMessage' of github.com:jdarling91/allplayers-android into addComposeMessage

Conflicts:
	AndroidManifest.xml
	res/layout/inboxlist.xml
	src/com/allplayers/android/GroupMembersActivity.java
	src/com/allplayers/android/MessageActivity.java
	src/com/allplayers/android/SelectMessageContacts.java
	src/com/allplayers/android/SelectUserContacts.java
Merge branch 'icowleysViewPagerIndicatorProgress' of github.com:jdarling91/allplayers-android into addComposeMessage

Conflicts:
	AndroidManifest.xml
	res/layout/selectmessagecontacts.xml
	src/com/allplayers/android/MessageActivity.java
	src/com/allplayers/android/SelectMessageContacts.java
	src/com/allplayers/android/SelectUserContacts.java
Reformatted everything.
Merge branch 'icowleysViewPagerIndicatorProgress' of github.com:jdarling91/allplayers-android into addComposeMessage

Conflicts:
	src/com/allplayers/android/SelectMessageContacts.java
	src/com/allplayers/android/SelectUserContacts.java
Saving work done on messaging and grouppage.
Changed xml values to nondeprecated values.
Merge branch 'icowleysViewPagerIndicatorProgress' of github.com:jdarling91/allplayers-android into addComposeMessage

Conflicts:
	res/layout/grouppage.xml
	res/layout/selectusercontacts.xml
	src/com/allplayers/android/SelectMessageContacts.java
Merge branch 'icowleysViewPagerIndicatorProgress' of github.com:jdarling91/allplayers-android into addComposeMessage

Conflicts:
	res/layout/grouppage.xml
	src/com/allplayers/android/SelectMessageContacts.java
	src/com/allplayers/android/SelectUserContacts.java
Merge branch 'addComposeMessage' of https://github.com/icowley/allplayers-android into icowleysViewPagerIndicatorProgress and save progress on message composition including the addition of a popup menu to deselect a user.

Conflicts:
	src/com/allplayers/android/SelectGroupContacts.java
	src/com/allplayers/android/SelectUserContacts.java