test modify in mac
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/alu_visit_page.php
	war/donate_page.php
	war/news_list.php
	war/page.php
	war/student_page.php
	war/studentmemberlogin.php
	war/studentmemberlogin2.php
	war/teacher3.php
	war/topic_apply.php
	war/topic_page.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/alu_ask_list.php
	war/alu_visit_list.php
	war/backendxyz/activity.php
	war/donate_list.php