normal dev
Merge branch 'master' into AdvanceSearchFeature

Conflicts:
	AdventureStoryFinal/src/edu/ualberta/adventstory/MainActivity.java