added bootsy gem
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
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
Merge remote-tracking branch 'origin/develop' into develop-ja
made bootsy_areas resizable
enabled auto deployment for develop branch
Merge remote-tracking branch 'origin/develop' into realmaster