test

testing check in
Merge remote-tracking branch 'origin/jpittman' into driley
test conflict

added a comment in inventory to test conflicts.
Merge remote-tracking branch 'origin/jpittman' into driley
test conflict
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.
test conflict 3
Revert d42d219..c9e4429

This rolls back to commit d42d219b9088fd6419f78a29133539184aa60028.
Merge remote-tracking branch 'origin/jpittman' into driley
new config file
config.xml changes

copy out_config.xm_bak to the folder above the www and rename to
config.xml—changes to context manager animation
Merge branch 'RSherman_LEX'

changes to config.xml—keep this new one in www, take the one named
out_config.xm_bak, move to the folder above www (delete the config.xml
that is there) and rename to config.xml.
Changes to context manager
New ContextManager

new context manager
Added caseID and HospitalID to case manager object.
stabilize menu animations

Also his the slide over
Merge branch 'RSherman_LEX'
CaseManager, ContextManager, Queue and Ajax

CaseManager fixes for UI formatting, Context, Ajax and Queue bug fixes.
(One in context is a fix for caseDetails)
Merge branch 'master' into RSherman_LEX
committing so I can get code from Rob.