update gitignore
add android studio stuff to gitignore
update directory structure for android studio
fix gitignore conflict
remove unused eclipse structure and files