Navi
js navi
Merge branch 'dev' of https://github.com/Mischazz/DorfKinderTiere into dev

Conflicts:
	js/script.js