merge
Merge branch 'master' of bitbucket.org:tracersoft/mediadrawer-rails
Merge branch 'master' of bitbucket.org:tracersoft/mediadrawer-rails
Merge branch 'master' of bitbucket.org:tracersoft/mediadrawer-rails
Merge
Merge branch 'master' of bitbucket.org:tracersoft/mediadrawer-rails
remove ruby-filemagic
Merge branch 'master' of bitbucket.org:tracersoft/mediadrawer-rails

Conflicts:
	Gemfile.lock
Get content_type from file or request