map marker placed

still working
Merge branch 'master' of https://github.com/JalenTheory/travistIstanbul

Conflicts:
	gen/travist/pack/R.java
merging changes
commiting auto generated files