Added rule Merchant: EnableAltCurrencySell - defaults to true, allows servers to disable the ability to resell items to alternate currency merchants.
Merge remote-tracking branch 'remotes/Eqemu/master'
Fixed augs having 100% proc rate
Merge pull request #121 from Siroro/master

Added rule Merchant:EnableAltCurrencySell
Exported TrainDisc to Lua.
Updated idle timer names.
Crit Spells to StringIDs
Some minor clean up
Fix an mlog message