Login fixed bro
Fixed conflicting lines

Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartParkAndroid/src/com/smartpark/activities/MainActivity.java