profile menu improved
backup dump created
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/css/base.css
Merge remote-tracking branch 'origin/master'