Merge "Adding Absolute layout" into devel/master