Fixed bug where new inventory entry location was being created when editing inventory at same location
fixed configuration application
Merge branch 'master' of github.com:portablemind/compass_agile_enterprise
Merge remote-tracking branch 'origin/master' into bootstrap