Merge branch 'master' of https://github.com/craigwedseltoft/brainstorm

Conflicts:
	client/brainstorm.css
Merge remote-tracking branch 'origin/master'