remove duplicate bootstrap.css
Merge remote-tracking branch 'mannix/master'
update new edit item controller
Merge remote-tracking branch 'mannix/master'
merge mannix code jan-24
Merge remote-tracking branch 'stephen/master'