Comments
Merge origin/master

Conflicts:
	fuel/app/classes/model/user.php
	public/assets/css/style.css