before merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	static/less/style.less
Made ghost rows

Conflicts:
	static/less/style.less
	templates/layout/template.html
ghost row for item parent row will not show

Conflicts:
	static/less/style.less
	templates/layout/template.html
Merge remote-tracking branch 'upstream/master'

Conflicts:
	static/coffee/view/Row-view.coffee
	static/coffee/view/ToolItem-view.coffee
Merge remote-tracking branch 'upstream/master'

Conflicts:
	static/coffee/view/Row-view.coffee
	static/coffee/view/ToolItem-view.coffee
Merge branch 'master' of git://github.com/lynx1983/bootstrap-form-builder into lynx1983-master
fix branch
merge with lexich