Added mock to requirements
Merge branch 'master' into navbar_bugfix