no message
Merge branch 'finishing' of https://github.com/thunderdomes/Struts into finishing

Conflicts:
	melon.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate