new function mergeGenres to Genre model
Merge remote-tracking branch 'origin/dev/master' into dev/deguzi
Merge remote-tracking branch 'origin/dev/master' into dev/deguzi
add phpunit to composer.json

added as required for development
first rockit test
delete myTest.php and create myRockitTest.php
correct errors from git interface
Merge remote-tracking branch 'origin/dev/master' into dev/deguzi
run a first test on memberControler
attempted second test
attempted third testest

composite t
Merge remote-tracking branch 'origin/dev/master' into dev/deguzi
Merge remote-tracking branch 'origin/dev/master' into dev/deguzi
continue first test
continue first test
Merge remote-tracking branch 'origin/dev/master' into dev/deguzi
small changes in composer.json
fix /namespace
adapt tests
improve tests for show peripheral tables