Merge "Adding LayoutController and bindings" into devel/master