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.
Revert 6b04cc6..03a64a1

This rolls back to commit 6b04cc626f20e4ff65e5d571c948dc472ac1188d.
Revert 05e49d9..454ebd5

This rolls back to commit 05e49d9976f9730b272fab569557df8a1ea4f658.
Revert "test conflict 3"

This reverts commit 03a64a14b8b29b905ffe1296fa033e0ff320741e.
new generic css generic classes
changed arrow style for collapsible list carousel