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
create script to run the tests
Merge branch 'master' of github.com:hacklabr/mapasculturais
Merge branch 'master' into stable
add hooks panel.menu:before and panel.menu:after
fix plugin em-cartaz to use panel.menu hooks
deploy script now execute db updates after git pull
Merge branch 'master' into stable

Conflicts:
	scripts/deploy.sh
remove entity.load hooks; cache hook callback search
Merge branch 'master' into issue-222-sass