Bootstrap 3.0  etc.
Merge branch 'master' into bootstap3

Conflicts:
	views/base.tx
	views/edit.tx
	views/edit_complex.tx
	views/index.tx
	views/list.tx
	views/view.tx
	views/view_graph.tx
Merge branch 'bootstap3'