reset
Merge branch 'master' of https://github.com/RetVal/Risp

Conflicts:
	Risp/Risp.xcodeproj/project.pbxproj
	Risp/Risp/DataContainer/RispMap.m
	Risp/Risp/FixupHook/__RispFXHookNSCFBoolean.m
	Risp/RispReader/WindowControllers/RispRenderWindowController.xib
	RispMobile/Risp/Risp.xcodeproj/project.pbxproj
	RispMobile/Risp/RispReader/RispAppDelegate.m
	RispMobile/Risp/RispReader/RispReader-Prefix.pch