CG-CamSys:develop

hi there, here are our changes for the kiosk. Here is a summary of some of the things I had to do after merging upstream:

* Various fixes to asset pipeline including for urls in css
* removed attr_accessible in some models
* deleted models / reference to models that were renamed
* moved js into includes so it would be globbed 
* some of the code generated by form_for changed slightly so js hooks needed to be updated

There wasn't much issue on our end with the Rails 4 upgrade.