Fix some problem
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	App/bin/classes/ca/ualberta/app/activity/CreateQuestionActivity.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity$1.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity$AddThread.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity$GetThread.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity$SearchThread.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity.class
	App/bin/resources.ap_
	App/src/ca/ualberta/app/activity/LoginActivity.java
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup