First commit form AndroidStudio
merge