Merge pull request #234 from openelisglobal/develop

Merge of develop to master for 4.1
Added village to CDI addresses

https://www.pivotaltracker.com/story/show/50831931
Merge pull request #253 from pfschwartz/develop

Added village to CDI addresses
Removed referring lab sample id from non-conformity page for CDI REgional Labs

https://www.pivotaltracker.com/story/show/50548669
Merge pull request #254 from pfschwartz/develop

Removed referring lab sample id from non-conformity page for CDI REgiona...
Merge branch 'oe4.1.1' of git://github.com/openelisglobal/openelisglobal-core into develop

* 'oe4.1.1' of git://github.com/openelisglobal/openelisglobal-core:
Added warning message when searching by patient for modify order

https://www.pivotaltracker.com/story/show/70980652
Merge pull request #255 from pfschwartz/develop

Added warning message when searching by patient for modify order
redid the layout of the patient information page, only a little

https://www.pivotaltracker.com/story/show/54309808
Merge pull request #256 from pfschwartz/develop

redid the layout of the patient information page, only a little
Removed "test" from rejection report when the criteria is by test

https://www.pivotaltracker.com/story/show/71513572
Merge pull request #261 from pfschwartz/develop

Removed "test" from rejection report when the criteria is by test
Handled null pointer exception which was happening during startup
Merge pull request #262 from pfschwartz/develop

Handled null pointer exception which was happening during startup
Order of database updates was not correct
Merge pull request #264 from pfschwartz/develop

Order of database updates was not correct
French version of maintaining the test catalog
Merge pull request #266 from pfschwartz/develop

French version of maintaining the test catalog