# Conflicts:
#	application/api/controller/Member.php
#	application/database.php
#	application/index/controller/Member.php
#	application/index/view/global/navigation.html
#	application/index/view/member/users_list.html
#	application/model/Users.php
#	public/resource/js/user.js