JC: added active boolean field to allocations. spec passes.
Merge branch '3.2.12.01' of github.com:emclab/resource_allocx into 3.2.12.01
JC: removed gemfile.lock (NOT UPLOAD IT). Comment out validate in man_power for position which is not working right.