Merge pull request #12 from Muriasen/master

Merge fix.
facilityController edit restructuring