hooked up user login
merged user activity.java

Merge branch 'master' of https://github.com/melvrickgoh/LateLiao

Conflicts:
	LateLiao/src/com/example/nav2/UserActivity.java