updated INSTALL docu and apache templates
Merge branch 'master' of https://github.com/BeDefCERT/MISP
updated github url
Merge branch 'develop'
Merge branch 'develop'
removed unused CyDefSIG.showowner field. Closes issue #93
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
removes multiple correlation engines Fixes #83 but after testing issue
#95 comes to light
Merge branch 'master' of https://github.com/MISP/MISP.git
fix merge issue
Fixed a sanitization issue with encrypted emails
updated gitignore
Merge branch 'master' of https://github.com/MISP/MISP.git
Merge branch 'master' into develop

Conflicts:
	app/Config/bootstrap.default.php