update to deploy.sh
Merge remote branch 'origin/master'

Conflicts:
	deploy.sh
	src/main/resources/notes-security.xml