asdfasdf
some changes
asdfasdfa
Merge branch 'master' of https://github.com/ABstraktED/MeetMe.git

Conflicts:
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$attr.class
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$dimen.class
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$drawable.class
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$id.class
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$layout.class
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$menu.class
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$string.class
	App/Android/MeetMe/bin/classes/pwr/itapps/meetme/R$style.class
	App/Android/MeetMe/gen/com/google/android/gms/R.java
	App/Android/MeetMe/gen/pwr/itapps/meetme/R.java
	App/Android/MeetMe/project.properties
	App/Android/MeetMe/res/layout/activity_register.xml
	App/Android/MeetMe/res/menu/main.xml
	App/Android/MeetMe/res/values/strings.xml
	App/Android/MeetMe/src/pwr/itapps/meetme/activity/RegisterActivity.java
	App/Android/MeetMe/src/pwr/itapps/meetme/activity/WallActivity.java
	App/Android/MeetMe/src/pwr/itapps/meetme/fragments/MapsFragment.java