Merge pull request #55 from Edugate/develop

closes #54  plus more
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
fix typo