integrated parameters for the caligraphy style
resolved conflicts for caligraphy style
Merge branch 'master' of https://github.com/der-rob/gFrame

Conflicts:
	src/gFrameApp.cpp
	touchosc/20141114_gframe_osc.touchosc