Fixes layout margins for iOS 8
Merge branch 'fix/layout-margins' into develop

* fix/layout-margins:
  Fixes layout margins for iOS 8