Bug 6535 has been fixed by please workers )).
Merge branch 'master' of github.com:7bits/jade-fff

Conflicts:
	src/main/webapp/WEB-INF/views/recruiter/recruiter-active-bids.jade