Feature 3-1 commit
Feature 3-2 commit
Feature 3-3 commit
Feature 3-4 commit
Feature 3-1 commit

Summary:
Feature 3-2 commit

Feature 3-3 commit

Feature 3-4 commit

Feature 3-5 commit

Reviewers: mic

Reviewed By: mic

Differential Revision: http://www.phabricator.bmm/D54
Merge branch 'feature/feature3' into develop