alles mögliche + strgz/y
Merge branch 'master' of https://github.com/tohu/lookin

Conflicts:
	lookin-0_0_1/Graph.h
	lookin-0_0_1/Lookin.cpp
	lookin-0_0_1/Lookin.h
	lookin-0_0_1/camera.cpp
	lookin-0_0_1/camera.h
	lookin-0_0_1/lookin-0_0_1.pro.user
Merge branch 'master' of https://github.com/tohu/lookin
zy mit zy-navigation