Fixes #732
* Move ERC20 contracts to ERC20 custom folder * Fix linter warnings for ERC20 contracts
Fixes OpenZeppelin/zeppelin-solidity#434