fix flickering
Merge branch 'master' of github.com:fhacktory/aperitif
update mockup
Merge branch 'master' of github.com:fhacktory/aperitif