Merge origin/master

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

Conflicts:
	application/models/m_user.php
Merge master into HEAD

Conflicts:
	application/controllers/admin/order.php
	application/views/admin/orders/index.php