Local database
Local database 2
Change user for Local database
Change to the previous user
Added email settings
Fix logo centering
Merge branch 'laptop_local' into alwaysdata_prod

Conflicts:
	kat/kat/settings.py
Add static pages; Activate gallery; Add video model; Add prettyphoto
Add static pages; Refactor code
Add static pages 3; Add account templates
Merge branch 'laptop_local' into alwaysdata_prod
Merge with local branch