a
Merge branch 'master' of https://github.com/kienle/projects

Conflicts:
	MydBatWid/res/layout/autocomplete_1.xml