Merge branch 'master' into dev
Merge branch 'dev' of github.com:nbproject/nbproject into dev
use email from settings
Fix bug 133: printing sections names (cf commit 1552da60d2647118144fc37884c467ecf58ae7bb) broke the collage view
Merge branch 'master' into dev

Conflicts:
	apps/nbsite/settings.py
Merge branch 'dev' into import-annotation