Merge "Added code for stylable transitions" into devel/master