Merge pull request #138 from tkowark/develop

Merge develop into master
errbit, baby, yeaaaah
Merge pull request #139 from tkowark/develop

fixed chair bug for anonymous user
Merge branch 'master' of https://github.com/tkowark/hpi-hiwi-portal
added bootsy gem
changed company and added favicon. mainly to test travis ci...
Merge remote-tracking branch 'origin/develop' into develop-ja-text-editor
Added Text editor to all text_area fields #106
gemfile.lock automatically modified
enabled automatic travis deployment on heroku
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja

Conflicts:
	.travis.yml
Merge remote-tracking branch 'origin/develop-ja-text-editor' into develop-ja
adapted chairs show to current job offers filter_status function
tried to enable deployment from develop-ja branch
tried to enabled auto deployment for develop-ja
entered possibly the right app name in travis.yml
merged master
Merge pull request #141 from tkowark/develop

Fixed chair show and refactored chairs controller
Merge remote-tracking branch 'origin/develop' into develop-ja
made bootsy_areas resizable