Fixed calc z-index bug
Merge branch 'develop' of https://github.com/ccstevenson/KenjisQuestFrontend into develop