Converted the project to maven.
Merged everything. Missed a pull before converting to maven.
Update the repo