changed some functionaltiy for controls
Merge branch 'master' of https://github.com/oherterich/NWS_violins

Conflicts:
	particle0/src/testApp.cpp
Merge branch 'master' of https://github.com/oherterich/NWS_violins