Messages done
Fixed conflict
Merge commit 'f69c851'

Conflicts:
	bootstrap/less/bootstrap.less