Junk
Merge branch 'legacy-merge' of https://github.com/InfinityHoldings/EntourageAndroid into legacy-merge

Conflicts:
	Entourage/bin/classes/com/infinity/entourage/LoginActivity.class
	Entourage/bin/classes/com/infinity/entourage/MainActivity.class