Temp Save
Merge remote-tracking branch 'upstream/master'

Conflicts:
	RcmAdmin/public/js/admin/rcm-admin.js
Legacy adaptor for the user map.
Merge pull request #197 from jerv13/master

Brightcove update, fix data on save
Merge remote-tracking branch 'upstream/master'
dialog for page permissions
fixPagePermission
Merge pull request #198 from innaDa/pagePermissionsDialog

dialog for page permissions
Added Save Methods and minor code cleanup.
Merge pull request #196 from wshafer/master

Initial clean up of service managers
Merge remote-tracking branch 'upstream/master'