settings.py-dev -> settings.py + handling of settings_local
Merge branch 'master' of github.com:Psycojoker/abrakadaban
Merge remote-tracking branch 'roi/master'
use TemplateGenericView
use string in urls to get views
fix, views getting string was bad
remove blank line
use a base.haml template
merge
Merge remote-tracking branch 'bram/master'

Conflicts:
	abrakadaban/kanban/templates/kanban/workspace.haml