v1.2
v1.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/haproxy/edit.js
	templates/haproxy/edit.html
v1.2.1