[#46531233] admin can now see & change the is_currrent flag
upgraded bootstrap-editable
[#61746906] added TRADE_ENTITY type
[#61746906] enabled trade to use TRADE_ENTITY
public interface should probably not show TRADE_ENTITY
would returning promises in beforeModel hook help with properly binding shipment associations?
[#61993638] should fix issue with disappearing search results
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop
Merge pull request #150 from unepwcmc/citestrade-monitor

Citestrade monitor
Merge branch 'develop' into not_current_and_crazy_geo_entities
new feature message styling
[#61746906] fixed misleading display of not current & properly set the currently selected state of is_current flag in in place editor
Merge branch 'develop' into not_current_and_crazy_geo_entities

Conflicts:
	db/schema.rb
banner interaction and markup improvement
Merge pull request #152 from unepwcmc/banner

Banner
removed a naughty console.log
Merge pull request #147 from unepwcmc/not_current_and_crazy_geo_entities

Not current and crazy geo entities
Merge branch 'develop' into citestrade-tweaks
[#62471240]