resolved all merge conflicts
solved more merge conflicts
solved more merge conflicts ^^
readded programming_languages_job_offers table in schema
reader navbar on top
added paperclip url instead of gem
try to avoid deploy error
added dpl gem
changes of last commit also in Gemfile.lock
Reverted changes
added model test for search #8
added controller test for sort
Merge remote-tracking branch 'origin/develop-ja' into crud-job-offers

Conflicts:
	db/schema.rb