update .gitignore
Merge master into develop

Conflicts:
	.gitignore
Merge master into develop
create visitor class
sandbox mailer
fix expiring alerts
new staff confirmation email; sandbox menu updates
exception notices
correct parameter.yml.dist
correct namespace path
rename bundle
replace text editor
add image upload and include
add image upload and include