checkin test
test

testing check in
remove creation of allocationView view on inventory obj creation
Merge remote-tracking branch 'origin/jpittman' into driley
test conflict

added a comment in inventory to test conflicts.
test confilct
Merge remote-tracking branch 'origin/jpittman' into driley
test conflict
test conflict 2
Revert "Merge remote-tracking branch 'origin/jpittman' into driley"

This reverts commit d42d219b9088fd6419f78a29133539184aa60028, reversing
changes made to 3524dc79be2a7af6c79d85344c699ed6d6a4225f.
Revert d42d219..a1ab473

This rolls back to commit d42d219b9088fd6419f78a29133539184aa60028.
Revert 2891883..49d5ef8

This rolls back to commit 2891883ee92c6aa4bf103d60cd19f965e9f36a31.
test conflict 3
test conflict 3
Revert d42d219..c9e4429

This rolls back to commit d42d219b9088fd6419f78a29133539184aa60028.
Changed id names to conform with code standards -JEuvin
Merge branch 'driley' of https://github.com/itraycer/iTraycer into jeuvin