Updated Bash Scripts, Bugfixing Menu
Merge branch 'master' of https://github.com/Fannon/IA6.Medienprojekt

Conflicts:
	client/obacht/menu.js
Updated Bash Script, Bugfixes in Menu