before merging nahush's
add gitignore
resolve bin files
removed all cached bin files
resolve merging issues
update gitignore
resolving git merging issues
added Android.mk
make jni/Android.mk local
Removed generated files
update arrow maps
update gitignore
remove unnecessary files from master
remove unnecessary files
Merge branch 'master' into andrew
merge nahush, UI and andrew
update simulated map, align map with simulated map
no idea what's this