inputs
Merge remote-tracking branch 'origin/master'

Conflicts:
	generated/Slick/Grid.js
	generated/Slick/RowSelectionModel.js
	generated/behaviors/MenuList.js
	generated/contexts/BoringContext.js
	generated/eventBus/AppEventBus.js
	generated/mediators/IndexMediator.js
	generated/mediators/orders/OrderMediator.js
	generated/mediators/products/AnimalDetailMediator.js
	generated/mediators/products/AnimalMediator.js
	generated/mediators/products/MiscMediator.js
	generated/messages/BoringMessageGenerator.js
	generated/messages/MessageGenerator.js