modify expandable list indicator
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/FragmentMain.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile$1.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile$2.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile$3.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile$4.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile$5.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity.class
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/FragmentMain.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity.class