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

Conflicts:
	slcdemo.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/js/main.js