added nwcloud.properties + some cleaning

Change-Id: I712724a9e83a3bd4ff0f4862979e3c0bd0d12374