fix bug
Merge branch 'origin/master'

Conflicts:
	Final project/bin/BK-CTXH.apk
	Final project/bin/classes.dex
	Final project/bin/classes/com/coredump/views/ActivityView$FetchTask.class
	Final project/bin/classes/com/coredump/views/ActivityView.class
	Final project/bin/resources.ap_