ec2 dev
Merge branch 'master' into ec2dev

Conflicts:
	preCache.py
merge
merge
a
a
Merge branch 'master' into ec2dev
change
Merge branch 'dev'
Merge branch 'dev' into ec2dev

Conflicts:
	static/js/application.js
change
kaka
0.4
Merge branch 'ec2dev'
0.4