remove lib from ignore file
move to android support r10
merge develop-no-maps