Merge "Refactoring transition and fadeTransition" into devel/master