making return type optional, adding some changes to GamePlan model
Merge branch 'master' of https://github.com/voltron42/sandbox

Conflicts:
	umlsvg/domain.dtd