commit
Merge branch 'master' of https://github.com/brmahar/takethree

Conflicts:
	Socialize/bin/Socialize.apk
	Socialize/bin/classes.dex
	Socialize/bin/classes/com/lovrhatr/socialize/EventActivity.class
	Socialize/bin/classes/com/lovrhatr/socialize/Login.class
	Socialize/bin/classes/com/lovrhatr/socialize/MainActivity.class
	Socialize/bin/classes/com/lovrhatr/socialize/R$id.class
	Socialize/bin/classes/com/lovrhatr/socialize/R$layout.class
	Socialize/bin/classes/com/lovrhatr/socialize/R$menu.class
	Socialize/bin/classes/com/lovrhatr/socialize/R$string.class
	Socialize/bin/classes/com/lovrhatr/socialize/R$style.class
	Socialize/bin/resources.ap_
	Socialize/gen/com/lovrhatr/socialize/R.java