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