qplay v1
Merge branch 'master' of https://github.com/cyrusbowman/RockApp

Conflicts:
	bin/RockApp.apk
	bin/classes.dex
	bin/classes/edu/purdue/autogenics/libcommon/R$drawable.class
	bin/classes/edu/purdue/autogenics/rockapp/IconProvider.class
	bin/classes/edu/purdue/autogenics/rockapp/MainActivity$1.class
	bin/classes/edu/purdue/autogenics/rockapp/MainActivity$2.class
	bin/classes/edu/purdue/autogenics/rockapp/MainActivity$3.class

bin/classes/edu/purdue/autogenics/rockapp/MainActivity$MapBroadcastRecie
ver.class

bin/classes/edu/purdue/autogenics/rockapp/MainActivity$RockMenuBroadcast
Reciever.class
	bin/classes/edu/purdue/autogenics/rockapp/MainActivity.class
	bin/classes/edu/purdue/autogenics/rockapp/MarkerHandler.class
	bin/classes/edu/purdue/autogenics/rockapp/R$string.class
	bin/classes/edu/purdue/autogenics/rockapp/R$style.class
	bin/classes/edu/purdue/autogenics/rockapp/R$styleable.class

bin/classes/edu/purdue/autogenics/rockapp/RockMenu$CommentOnFocusChangeL
istener.class

bin/classes/edu/purdue/autogenics/rockapp/RockMenu$PictureOnLongClickLis
tener.class

bin/classes/edu/purdue/autogenics/rockapp/RockMenu$RockBroadcastReceiver
.class

bin/classes/edu/purdue/autogenics/rockapp/RockMenu$RockImageActionModeCa
llback$1.class

bin/classes/edu/purdue/autogenics/rockapp/RockMenu$RockImageActionModeCa
llback$2.class

bin/classes/edu/purdue/autogenics/rockapp/RockMenu$RockImageActionModeCa
llback.class
	bin/classes/edu/purdue/autogenics/rockapp/RockMenu.class
	bin/classes/edu/purdue/autogenics/rockapp/trello/SyncController.class

bin/dexedLibs/android-maps-extensions-22cddbe5ff8493ecf3bf388c75f8bfb9.j
ar
	bin/dexedLibs/android-support-v4-61618e01363011ca7a89046736921ddb.jar
	bin/dexedLibs/google-play-services-087a7c6a7bf9ef1215dfe2607390e72d.jar
	bin/dexedLibs/libcommon-cea1764f839f48efb442fdad58af1c99.jar
	bin/dexedLibs/libtrello-9fac137c19dbdd29d96bb4314eac199d.jar
	bin/resources.ap_
	src/edu/purdue/autogenics/rockapp/IconProvider.java
	src/edu/purdue/autogenics/rockapp/MainActivity.java
	src/edu/purdue/autogenics/rockapp/MarkerHandler.java
	src/edu/purdue/autogenics/rockapp/RockMenu.java
	src/edu/purdue/autogenics/rockapp/trello/SyncController.java