stuff
Merge branch 'master' of https://github.com/stealthycoin/kaleidoscope

Conflicts:
	appsConfig.py
Tidyed up imports
Documentation section started