# Conflicts:
#	application/api_broker/controller/User.php
#	application/index/controller/Member.php
#	application/index/view/global/footer_tpl.html
#	application/model/Users.php