bugfix

Upload needs bugfix
upload: filename
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
Upload+thumb

bugfixed
deleted easyimage
Merge pull request #6 from xy00z/Sami

Sami