added bullet
Merge branch 'master' into bullet-riaz
updated items after merge
Merge branch 'master' into bullet-riaz

Conflicts:
	app/controllers/jobs_controller.rb
	app/views/jobs/show.html.haml