opppss i forget commmit  :-)
Merge branch 'master' of github.com:Kozea/wdb

Conflicts:
	wdb_server/static/sass/_dark.sass
	wdb_server/static/sass/_wdb.sass
	wdb_server/static/sass/wdb-dark.sass
	wdb_server/static/stylesheets/wdb-dark.css
	wdb_server/static/stylesheets/wdb-light.css