Merge branch 'master' of https://github.com/agrubi/bored_minutes

Conflicts:
	app/view/email/RecipientField.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.json