add default gradle android project with rest_helper and gson
fix merge conflict