some time filter stuff
Merge branch 'master' of https://github.com/splichte/PLF

Conflicts:
	plf/templates/base.html