enabled automatic travis deployment on heroku
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja

Conflicts:
	.travis.yml