Merge branch 'master' into develop
version up to 2.0.0 (enable room color setting)