Location, Mao, Messages, and Scene classes added Oct 8th 2014
Merge origin/master

Conflicts:
	princessBride/src/byui/cit260/princessBride/control/SceneControl.java