the new color control UI design
Merge branch 'master' of https://github.com/gergelydezso/SmartLampProject

Conflicts:
	SmartLampSample/src/com/gergelydezso/smartlampsdk/sampleapp/notifications/NotificationsFragment.java
Removed source files from gitignore