More unit test fixes
Merge remote-tracking branch 'jaggr/master'
Resolve merge conflict
Merge pull request #15 from chuckdumont/master

More unit test fixes
messages_en.properties files
Merge pull request #16 from chuckdumont/master

messages_en.properties files
Ensure that properties files are included in the built artifacts.