Small changes

- added an optional field to the bootstrap default (used by the e-mail
  notification system)

- Clarification about the isAdmin and isSiteAdmin (comment)
Small fix
Merge branch 'master' of https://github.com/MISP/MISP

Conflicts:
	app/Config/bootstrap.default.php