Channels changes/updates
Merge branches '0-7-0-BRANCH' and '0-7-0-BRANCH' of https://github.com/careck/cmfive into 0-7-0-BRANCH

Conflicts:
	system/modules/channels/models/EmailChannelOption.php
DB Update! Can now parse emails and save attachments, added Zend Serializer but will probably remove that as we no longer have a need
Merge branch '0-7-0-BRANCH' of https://github.com/careck/cmfive into 0-7-0-BRANCH