New version of project
Merge to remove android studio project from head.