Mockups removed
Merge branch 'dev'