working on.
Merge branch 'isaac' of https://github.com/tearsofphoenix/Fraise into isaac

Conflicts:
	Classes/FRAToolsMenuController.m
	Fraise.xcodeproj/project.pbxproj