Merge pull request #24 from lohuvie/master

merge
	modified:   .idea/workspace.xml
	modified:   contacts.php
	modified:   css/contacts.css
	modified:   css/index.css
	modified:   js/contacts/contacts.alert.js
	modified:   js/contacts/contacts.group.js
	modified:   js/contacts/contacts.init.js
	modified:   js/contacts/contacts.loading.js
	modified:   js/contacts/contacts.person.js
	modified:   js/jquery.index.js
	modified:   js/jquery.new-activity-pic.js
	modified:   json/attention_list.php
	modified:   new-activity.php
	modified:   php/attention_person_delete.php
	modified:   php/attention_person_move.php
	modified:   top-nav.php
	modified:   top-nav.php
Merge pull request #45 from willkan/master

星期天的更新