removed fileoutput for xls files
Merge branch 'devel' of github.com:yannickschuchmann/mamadata into devel

Conflicts:
	mamadata_rails4/app/assets/javascripts/application.js