template xxx.properties files finally included

Change-Id: I16e613f46604a1a31e2afe6c5d4c903e80cf8f0f
more polished settings UI

Change-Id: I26e62edeaf37326708cb83067c11c6c6951cd58d