Frontend update

Frontend update
Merge branch 'master' of https://github.com/tkok/GSD-report