fixed a typpyo in webcirc2.js
added codde for administerStatus on webcirc.js
Merge pull request #11 from willametteuniversity/hparker

Finished location administration page
fixed an issue with Administer Status
Merge pull request #12 from willametteuniversity/hparker

Merging labels not categories API
Fixed a proboblem with the administer status forms
Merged in kschadt's code
Fixed a few errors in the merge
Added back in administerStatuses file
Fixed up column formatting of New Reservation page
Started on being able to add actions to a reservation. Can reorder via drag-n-dropp. Can delete actions. no submission of reservations yet.
Tweaked reservation formatting again
Fixe dup a few fixtures, added URLs for CustomerProfile serializer, added in CustomerProfile serializer
Started on code to allow people to add equipment to reservations.
Fixed wrapping problem with remove button on specific pieces of equipment in each action div
Merge pull request #13 from willametteuniversity/fhaynes

Bringing in Fletcher's changes