little tweaks :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	website/views.py
little tweaks :)