yii-mailer added with config and MailCOntroller
Merge commit '99be207b766245435dd3c26f18c2bb6bd24a1d23' into feature/submission

Conflicts:
	protected/controllers/UserController.php

Merged from master to feature submission