production bom

added grid editable column
Merge branch 'master' of github.com:imagis/imagis-dev

Conflicts:
	composer.lock