t
Merge branch 'master' of ssh://git@github.com/reign770/JobPostingWeb.git

Conflicts:
	JobPostingsWeb/WebContent/s_CompanyPage.jsp
	JobPostingsWeb/src/com/codeblue/action/web/enterprise/CompanyPageAction.java