Added a new project in Play (java)
Removed standard play code
Resolved merge conflicts