switching comp
Merge https://github.com/laazer/Sunshine

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
more updates