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
add attachment html structure
add link to agent name
add hover style to %icon
most recent compiled css
fix conflicts
Registration single: remove git conflict message
Added attrs to EditBox onCancel event
Project single registration attachments: Now saves a backup before edit to rollback modifications on cancel
Removed console logs
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
Project Registration Attachments with separated edit box for file upload
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