Merge branch 'master' of https://github.com/SmartCampus/dashboard
Merge branch 'gh-pages' of https://github.com/SmartCampus/dashboard into gh-pages