Gmail working more or less
Timeout
Merge branch 'tcivera-master'

Conflicts:
	application/controllers/Author.php