What happened story-1-4

Summary: This is the merge request for story 1

Test Plan: none

Reviewers: mic

CC: bmm

Differential Revision: http://www.phabricator.loc/D15
Merge branch 'story-1-4' of github.com:bogdanmic/dummy-app into story-1-4