company, student, professor profile(edit,view), mainpage, telentcategory and jobcategory update
many changed
Merge branch 'master' of https://github.com/xargus/Hacca

Conflicts:
	HaccaTest/AndroidManifest.xml
	HaccaTest/bin/AndroidManifest.xml
	HaccaTest/bin/classes.dex
	HaccaTest/bin/resources.ap_
	HaccaTest/gen/com/broccoli/hacca/R.java
	HaccaTest/res/layout/company_list_page_activity_layout.xml
	HaccaTest/res/layout/company_list_page_adapter_child_layout.xml
	HaccaTest/res/layout/company_list_page_adapter_parent_layout.xml
	HaccaTest/res/layout/job_category_list_page.xml
	HaccaTest/res/layout/noticeboard_page_activity_layout.xml
	HaccaTest/res/layout/professor_edit_profile_page_activity_layout.xml
	HaccaTest/res/layout/student_edit_profile_page_activity_layout.xml
	HaccaTest/res/layout/student_list_page_activity_layout.xml
	HaccaTest/res/layout/telent_category_list_page.xml
	HaccaTest/res/values/strings.xml
	HaccaTest/src/com/broccoli/hacca/activity/CompanyEditProfilePageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/CompanyListPageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/CompanyMainPageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/CompanyViewProfilePageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/JobCategoryActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/LoginPageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/NoticeBoardPageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/ProfessorEditProfilePageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/ProfessorMainPageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/ProfessorViewProfilePageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/StudentEditProfilePageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/StudentListPageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/StudentMainPageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/StudentViewProfilePageActivity.java
	HaccaTest/src/com/broccoli/hacca/activity/TelentCategoryActivity.java
	HaccaTest/src/com/broccoli/hacca/adapter/company/CompanyAdapterChildViewSetter.java
	HaccaTest/src/com/broccoli/hacca/adapter/company/CompanyListPageAdapter.java
	HaccaTest/src/com/broccoli/hacca/adapter/noticeboard/NoticeBoardChildViewSetter.java
	HaccaTest/src/com/broccoli/hacca/adapter/student/StudentAdapterChildViewSetter.java
	HaccaTest/src/com/broccoli/hacca/dataconnectapi/DataBaseConnectWorker.java
	HaccaTest/src/com/broccoli/hacca/pageinfo/PageInfo.java
	HaccaTest/src/com/broccoli/hacca/pageinfo/ProfessorPersonnelInfo.java
	HaccaTest/src/com/broccoli/hacca/passer/searchparser/ProfessorPersonnelInfoParser.java
	HaccaTest/src/com/broccoli/hacca/registerapi/RegisterAPIImpl.java
	HaccaTest/src/com/broccoli/hacca/searchapi/SearchAPI.java
	HaccaTest/src/com/broccoli/hacca/searchapi/SearchAPIImpl.java
	HaccaTest/src/com/broccoli/hacca/updateapi/UpdateAPIImpl.java
	HaccaTest/src/com/broccoli/hacca/urlfactory/UrlParameterType.java
	HaccaTest/src/com/broccoli/hacca/urlfactory/UrlType.java