triggers implemented
Merge branch 'master' of http://github.com/elbaha/idolon

Conflicts:
	src/Level.cpp