Wiki File Upload
.
Merge branch 'master' into FileUploadWIki

Conflicts:
	app/views/wikis/_search.html.erb
Merge branch 'master' of https://github.com/Sepp1314/MyLearnSpace into FileUploadWIki

Conflicts:
	db/schema.rba