a
change
Merge branch 'dev' into ec2dev

Conflicts:
	static/js/application.js
change