no message
Merge branch 'master' of https://github.com/encuadro/encuadro

Conflicts:
	xcode/App/app0100/app0100.xcodeproj/project.xcworkspace/xcuserdata/encuadro.xcuserdatad/UserInterfaceState.xcuserstate