Cleared up Module-Context and Updated WebApp version