Merge remote-tracking branch 'origin/develop-ja' into develop
migrated to Bootstrap 3

commit af8877023bf943f988f52ec7270e793564ed9270
Author: alexanderernst <leverkusener77@googlemail.com>
Date:   Fri Nov 22 14:47:03 2013 +0100

    migrated to Bootstrap 3

commit 057cfed34d16ea9fbba3c2d4e1ad4aa69bed9477
Merge: b29acdc 8e77253
Author: alexanderernst <leverkusener77@googlemail.com>
Date:   Fri Nov 22 14:07:50 2013 +0100

    Merge remote-tracking branch 'origin/develop' into boostrap3-migration-johanna

commit b29acdccf8a0e0c4fb074461088982516ae2a52e
Merge: f88c5b0 711b108
Author: alexanderernst <leverkusener77@googlemail.com>
Date:   Fri Nov 22 13:59:56 2013 +0100

    Merge remote-tracking branch 'origin/develop-ja' into boostrap3-migration-johanna

    Conflicts:
    	Gemfile.lock
    	app/assets/javascripts/application.js
    	app/views/job_offers/_form.html.erb
    	app/views/job_offers/index.html.erb
    	app/views/layouts/application.html.erb

commit 711b108f37d855f87dd2af4a2c29024b1b9850e3
Merge: 0b7cb55 6beffaa
Author: Judith Hartmann <judith.hartmann@student.hpi.uni-potsdam.de>
Date:   Fri Nov 22 13:23:34 2013 +0100

    Merge remote-tracking branch 'origin/develop' into develop-ja

commit f88c5b0328cd261797419551390871b179f7616f
Author: alexanderernst <leverkusener77@googlemail.com>
Date:   Fri Nov 15 14:05:56 2013 +0100

    migrated job offers to bootstrap 3
Merge remote-tracking branch 'origin/develop' into develop-ja