Merge branch 'master' of https://github.com/hrkipp/slcdemo

Conflicts:
	slcdemo.iml
Merge branch 'master' of https://github.com/hrkipp/slcdemo

Conflicts:
	slcdemo.iml