0.4
dd
kak
ka
0.5
Merge branch 'dev' into ec2dev

Conflicts:
	preCache.py
	services.py
	static/index.html
0.5