Merge branch 'develop' of github.com:Hete/kohana-mail into develop

Conflicts:
	classes/kohana/model/mail.php