merge dev-gradle into tweaks
changes to post on tiki
update japanese strings
make sure color combobox gets set to correct localized color
make sure color gets saved when localized
merge final-pres into dev-gradle