Update project and fix build - #2

foliolo wants to merge 3 commits into

Update project and fix build#2
foliolo wants to merge 3 commits into
chenaoh:masterfrom
foliolo:master

Fix gradle issues to build the project