test

test
Merge branch 'Sami' of https://github.com/xy00z/wba2_ss14_gruppe17 into Sami

Conflicts:
	projekt/public/uploads/fullsize/Thumbs.db
	projekt/server.js