steria/swhrs-server — pull request #7 by christopher-meyer (2012-09-17 11:02:57+00:00)
Title: Merged and correct a few issues in regards to merge conflict that was.

Merged and correct a few issues in regards to merge conflict that was.