update
Merge branch 'master' of github.com:sureshmenon87/VehicleParkingSystem

Conflicts:
	bin/VehicleParkingSystem.apk
	bin/classes.dex
	bin/classes/com/vps/android/activity/LoginActivity$1.class
	bin/classes/com/vps/android/activity/LoginActivity$2.class
	bin/classes/com/vps/android/activity/LoginActivity.class
	src/com/vps/android/activity/LoginActivity.java