Merge remote-tracking branch 'jaggr/master'
Use non-OSGi version of NLS.java in jaggr-core
Include properties files in the jaggr-core built jar