Wiki FIleupload  -> Restful
Merge branch 'master' of git://github.com/Sepp1314/MyLearnSpace

Conflicts:
	config/routes.rb
a