Merge branch 'master' of https://github.com/bowonieh/akademik.git