...
Merge branch 'master' of github.com:lemade/outside
merge conflicts
Conflicts:
	db/development.sqlite
added pdf uploads to md-toolbar
added pdf uploads to md-toolbar
styles fpr public subscribers und some ugly stuff