progress
Merge branch 'master' of https://github.com/xy00z/wba2_ss14_gruppe17

Conflicts:
	projekt/public/js/function.js