Just a build
Merge branch 'master' of https://github.com/yaroslav-shlapak/SmartHouseRemote

Conflicts:
	.gradle/2.2.1/taskArtifacts/cache.properties.lock
	.gradle/2.2.1/taskArtifacts/fileHashes.bin
	.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
Build changes