#60: add settings frontend
Merge branch 'master' into settings

Conflicts:
	Resources/public/css/style.css
#22: apply default activity filter based on settings
#22 add date to default filters