Added logos
Merge branch 'master' of github.com:skeidel/providence-provenance
Added local configs
Changed login page, page footer and added placeholders for "formen", "agb" and "impressum". Also moved local config to global dir so that they actually generate conflics when we pull in upstram changes.
Move title generator in place and enable. Also delete local configs
Merge remote-tracking branch 'upstream/master'
Small front page changes
More front page changes
Rename plugin
Plugin now automatically resets status if something was changed
Reset for all types
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Default media display.conf
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/conf/app.conf
Merge remote-tracking branch 'upstream/master'
Provenance project changes
Disable unused plugins