Renamed transitions
Merge remote-tracking branch 'upstream/develop-v3' into develop-v3
Fixed OS X templates