Merge branch 'master' into rc
Merge branch 'master' into rc
Merge commit '7a4b7c9b05b63df5351a9dbf12b4440d65e47bf2' into rc
Fixed forgotten select2 assets from base theme

Conflicts:
	src/protected/application/themes/BaseV1/Theme.php
Merge branch 'fix-550' into rc
fix request ownership creation when the new owner is an agent of another user
fix request ownership creation when the new owner is an agent of another user
fix request reject: remove STATUS_REJECT, just delete the request
fix Request::save method
Merge branch 'master' into rc

Conflicts:
	src/protected/application/themes/BaseV1/Theme.php
Merge branch 'master' of github.com:hacklabr/mapasculturais
Merge branch 'stable'

Conflicts:
	src/protected/application/themes/active/theme.php
fix reject event notification
fix reject event notification
Merge branch 'rc'
Merge branch 'stable' into rc

Conflicts:
	src/protected/application/themes/active/theme.php
Merge branch 'rc'