Fixed flickering to old cate on exercise click
Merge branch 'development' into heroku