Fixes unexpected error in event occurence form save (#240)
Merge branch 'master' into stable
restart php-fpm after code update
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable

Conflicts:
	scripts/deploy.sh