no message
Merge branch 'master' of https://github.com/mpao/UIElements

Conflicts:
	bin/classes/io/github/mpao/uielements/MainActivity.class