Merge branch 'master' of https://github.com/omichde/UIKonfHeads

Conflicts:
	UIKonfHeads/const.h
Merge branch 'master' of https://github.com/omichde/UIKonfHeads

Conflicts:
	UIKonfHeads/const.h