First commit with jars.
Merge branch 'origin/master'