started working on category associations
Merge branch 'master' of https://github.com/curt-labs/GoAdmin

* 'master' of https://github.com/curt-labs/GoAdmin:
  added the ajaxness/functionality of adding/removing web requirements to web properties
started working on category associations for videos
Merge branch 'master' of https://github.com/curt-labs/GoAdmin

* 'master' of https://github.com/curt-labs/GoAdmin:
  added web properties upload functionality
  blew out old functionality and started on angular stuffs for FTP
  removed merge functionality in favor of copy