Fixed broken build.css.gfx build step

More changes to build.xml coming soon
Fixing styles for buttons
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	build.xml
Merge remote-tracking branch 'remotes/origin/develop'
[no-ref] Fixing build