get bitmap
Merge branch 'master' of https://github.com/iamrainius/Slice

Signed-off-by: Zhang Jing <rainius@163.com>

Conflicts:
	src/com/jingz/app/slice/IndoorMapView.java
commit