Mah Push
Merge branch 'master' of https://github.com/NathanBWaters/OutfitrMobile

Conflicts:
	Outfitr/bin/classes/com/waters/outfitr/LoginActivity.class
	Outfitr/bin/classes/com/waters/outfitr/R$layout.class
	Outfitr/bin/classes/com/waters/outfitr/R$menu.class
	Outfitr/bin/classes/com/waters/outfitr/R$string.class
	Outfitr/bin/classes/com/waters/outfitr/R$style.class
	Outfitr/gen/com/waters/outfitr/R.java