commiting new changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/glassdoor/controller/HomeController.java
	src/com/glassdoor/jobsearch/JobSearchService.java
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/lib/servlet-api-2.5.jar