Merge origin/master

Conflicts:
	application/models/m_user.php
Merge origin/master

Conflicts:
	application/models/m_user.php