app runs -> working screens (click the buttons :D)
Merge remote-tracking branch 'origin/master'