Merge pull request #25 from Edugate/develop

Develop
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 css
Merge branch '1.x-stable' into develop
css