to work with assimp
Merge branch 'master' of github.com:RealVirtImac/3DObs

Conflicts:
	src/Object.cpp
Merge branch 'master' of github.com:RealVirtImac/3DObs
Merge branch 'master' of github.com:RealVirtImac/3DObs
add sliders for lights intensity and lights position