added rave badges
Merge branch 'master' of https://github.com/DhanuJay/rave.git

Conflicts:
	bin/classes/com/virtusa/vrave/R$drawable.class
	bin/classes/com/virtusa/vrave/R$id.class
	bin/classes/com/virtusa/vrave/R$layout.class
	bin/classes/com/virtusa/vrave/R$menu.class
	bin/classes/com/virtusa/vrave/R$string.class
	bin/classes/com/virtusa/vrave/R$style.class
	bin/classes/com/virtusa/vrave/VRaveActivity$1.class
	bin/classes/com/virtusa/vrave/VRaveActivity$2.class
	bin/classes/com/virtusa/vrave/VRaveActivity$3.class
	bin/classes/com/virtusa/vrave/VRaveActivity$4.class
	bin/classes/com/virtusa/vrave/VRaveActivity$5.class
	bin/classes/com/virtusa/vrave/VRaveActivity$ExpandAnimation.class
	bin/classes/com/virtusa/vrave/VRaveActivity.class
	bin/classes/com/virtusa/vrave/ViewRavesFragment.class
	bin/resources.ap_
	bin/vRave.apk
	gen/com/virtusa/vrave/R.java
Merge branch 'master' of https://github.com/DhanuJay/rave.git

Conflicts:
	bin/classes.dex
	bin/classes/com/virtusa/vrave/R$id.class
	bin/classes/com/virtusa/vrave/R$layout.class
	bin/classes/com/virtusa/vrave/R$menu.class
	bin/classes/com/virtusa/vrave/R$string.class
	bin/classes/com/virtusa/vrave/R$style.class
	bin/resources.ap_
	bin/vRave.apk
	gen/com/virtusa/vrave/R.java
added a spinner
Merge branch 'master' of https://github.com/DhanuJay/rave.git

Conflicts:
	bin/classes.dex
	bin/classes/com/virtusa/vrave/R$drawable.class
	bin/classes/com/virtusa/vrave/R$id.class
	bin/classes/com/virtusa/vrave/R$layout.class
	bin/classes/com/virtusa/vrave/R$menu.class
	bin/classes/com/virtusa/vrave/R$string.class
	bin/classes/com/virtusa/vrave/R$style.class
	bin/classes/com/virtusa/vrave/VRaveActivity.class
	bin/classes/com/virtusa/vrave/ViewRavesFragment.class
	bin/res/crunch/drawable-hdpi/coach.png
	bin/res/crunch/drawable-hdpi/einstien.png
	bin/resources.ap_
	bin/vRave.apk
	gen/com/virtusa/vrave/R.java
	res/drawable-hdpi/coach.png
	res/drawable-hdpi/einstien.png
	res/layout/activity_vrave.xml
	res/layout/rave_badges_fragment_layout.xml