Merge branch 'master' of https://github.com/pboyer/flood into merge

Conflicts:
	app/app.html
	app/scripts/config.js
	app/scripts/models/Workspace.js
	app/scripts/views/AppView.js
	app/scripts/views/SearchView.js