login and regsiter
Merge branch 'master' of https://github.com/hmbrandt/FlexPark

Conflicts:
	FlexPark/src/com/admuc/flexpark/MainActivity.java