Merge remote-tracking branch 'origin/master'

Conflicts:
	Plugin/src/com/inputusername/bukkit/lualandplugin/FreeInventory.java