Login function loaded
Login edited
Merge branch 'master' of https://github.com/bopang/FaceMe

Conflicts:
	FaceMe_Android/src/com/example/faceme_android/ApplicationData.java