Merge "Adding GridLayout" into devel/master