updated for ubuntu 14.04 OSG library-install mode

--> necessary for 14.04+ ubuntus which have OSG 3.2 selected
Merge branch 'develop' of github.com:golems/grip2 into develop

Conflicts:
	CMakeLists.txt