Merge pull request #60 from SvenLehmann/master

added field category in equipment
added individual travis-badges
Merge pull request #61 from hpi-swt2/master

added individual travis-badges
Merge pull request #4 from hpi-swt2/Dolphins

Dolphins
Merge remote-tracking branch 'remotes/origin/master' into dev
#12 Display message if no upcoming events available
Merge pull request #5 from SvenLehmann/feature/#12

#12 Display message if no upcoming events available
Merge remote-tracking branch 'remotes/origin/dev' into feature/#23

Conflicts:
	config/locales/views/room.de.yml