Edit Activity and xml
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/classes/ca/ualberta/app/activity/FragmentMain.class
	App/bin/classes/ca/ualberta/app/activity/R$id.class
	App/bin/classes/ca/ualberta/app/activity/R$string.class
	App/bin/classes/ca/ualberta/app/activity/R$style.class
	App/gen/ca/ualberta/app/activity/R.java
	App/res/layout/activity_author_profile.xml
	AppTest/bin/classes/ca/ualberta/app/activity/test/Part2UseCaseTests.class