Add spinner
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/AnswerActivity.class
	App/bin/classes/ca/ualberta/app/activity/AuthorProfileActivity.class
	App/bin/classes/ca/ualberta/app/activity/CreateInputsActivity.class
	App/bin/classes/ca/ualberta/app/activity/EditInputsActivity.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile.class
	App/bin/classes/ca/ualberta/app/activity/FragmentSearch.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity.class
	App/bin/classes/ca/ualberta/app/activity/R$id.class
	App/bin/classes/ca/ualberta/app/activity/R$layout.class
	App/bin/classes/ca/ualberta/app/activity/R$menu.class
	App/bin/classes/ca/ualberta/app/activity/R$string.class
	App/bin/classes/ca/ualberta/app/activity/R$style.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter.class
	App/bin/resources.ap_
	App/gen/ca/ualberta/app/activity/R.java
	App/res/layout/fragment_main.xml
	App/src/ca/ualberta/app/activity/FragmentMain.java