commit before merge
Merge branch 'master' of https://github.com/iSee-kilos/iSee

Conflicts:
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$styleable.class
	bin/classes/com/google/android/gms/R$styleable.class
	bin/classes/com/isee/DrawActivity$1.class
	bin/classes/com/isee/DrawActivity$2.class
	bin/classes/com/isee/DrawActivity.class
	bin/classes/com/isee/DrawToolsBarFragment.class
	bin/classes/com/isee/MainActivity.class
	bin/classes/com/isee/MapFragment$1.class
	bin/classes/com/isee/MapFragment$ChangeMapTypeListener.class
	bin/classes/com/isee/MapFragment$MapClickedListener.class
	bin/classes/com/isee/MapFragment$MapMarkerClicked.class
	bin/classes/com/isee/MapFragment$MarkerInfoWindowClickedListener.class
	bin/classes/com/isee/MapFragment.class
	bin/classes/com/isee/PhotoActivity.class
	bin/classes/com/isee/R$styleable.class
	bin/classes/com/isee/SearchActivity$1.class
	bin/classes/com/isee/SearchActivity$2.class
	bin/classes/com/isee/SearchActivity$3.class
	bin/classes/com/isee/SearchActivity.class
	bin/classes/com/isee/SetColorFragment.class
	bin/classes/com/isee/SimpleAdapterFragment.class
	bin/classes/com/metaio/ar/ArActivity.class
	bin/classes/com/metaio/ar/ArMainActivity$AssetsExtracter.class
	bin/classes/com/stylingandroid/adapters/data/CounterContentProvider.class
	bin/classes/com/stylingandroid/adapters/data/CounterHelper.class
	bin/iSee.apk
	bin/resources.ap_
	src/com/isee/SearchActivity.java