commit
Merge branch 'version1' into version2

Conflicts:
	static/less/style.less
	templates/layout/template.html
Placeholder jittering during sorting fixed
Merge branch 'version2' of git://github.com/lynx1983/bootstrap-form-builder into lynx1983-version2

Conflicts:
	static/less/style.less