Delinting
Merge branch 'master' of github.com-micabyte:micabyte/lib_base

Conflicts:
	src/main/res/layout/balloonpopup.xml