Merge branch 'development' into testing
Merge branch 'testing'
Merge branch 'development' into testing
Fix few minor mistakes

Signed-off-by: Constantin Runge <uroc327@cssbook.de>
Merge branch 'testing'
Make hubcap.json more specific

The idea is:
in development and master are /doc subfolders, that contain the doxygen documentation
in gh-pages/docs are two subfolders, api-devel and api-release which represent the doxygen documentations from the branches development and master

Signed-off-by: Constantin Runge <uroc327@cssbook.de>
Merge branch 'master' into development
Add missing comma at line end

Signed-off-by: Constantin Runge <uroc327@cssbook.de>