search yaself which mysterys are included in this commit
Merge branch 'master' of github.com:brainpower/Maximum-Fish

Conflicts:
	src/renderer/items/SimView.cpp