copy libs to output folder (again!, but now in maven...)
Merge origin/master
Merge origin/master