Merge branch 'master' of https://github.com/Rouby/roll20-api-scripts

Conflicts:
	InventoryManager/InventoryManager.js
	InventoryManager/InventoryManager.min.js.map