Fix for #127
Fix for #133
Fix for #144
Better naming (mainStyle to baseStyle)
Fixed styling issue
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fixed styling issue
  Better naming (mainStyle to baseStyle)
  Fix for #144
  Fix for #133
  Fix for #127

Conflicts:
	haxelib/haxeui.zip