Merge pull request #272 from pfschwartz/develop

Updated catalog update changes to reflect the use of guids instead of te...
Merge pull request #273 from pfschwartz/develop

Updated wording and layout of report menu
Merge pull request #274 from pfschwartz/develop

Corrected wording in menu and title
Merge pull request #276 from pfschwartz/develop

Corrected wording in menu and title.  Made CI LNSP uniform with rest of ...
Merge pull request #277 from pfschwartz/develop

Blank reporting descriptions are now filled in with test names for local...
Merge pull request #278 from pfschwartz/develop

Merge of 4.1.1 and new billing reference number feature
Merge pull request #279 from pfschwartz/develop

Protection against orders without patients blowing up the code
Merge pull request #280 from pfschwartz/develop

Added tag to action forms where needed
Merge pull request #282 from pfschwartz/develop

4.1.1 merge and menu fix
Merge pull request #289 from pfschwartz/develop

4.1.1 merge and let users correct spelling
Merge pull request #292 from pfschwartz/develop

Merged from 4.1.1
Merge pull request #300 from pfschwartz/develop

Pulled out order type dependent behavior and added user selectable program
Merge pull request #301 from pfschwartz/develop

Corrected text for admin->config sample entry->program->edit
Merge pull request #303 from pfschwartz/develop

Merged from 4.1.1
Merge pull request #304 from pfschwartz/develop

fix to last checkin, left out context for haitiLNSP update
Merge pull request #305 from pfschwartz/develop

More test localization fixes
Merge pull request #307 from pfschwartz/develop

Partial checkin for activity report story
Merge pull request #310 from pfschwartz/develop

update CCMH units and labels on parts of addresss
Merge pull request #311 from pfschwartz/develop

Corrected HIV test spelling and fixed bug in workplan by test which got ...
Merge pull request #312 from pfschwartz/develop

merged Dr. Kone's work.  Localized site information description