Merge Interface-Mockup into sprint-1