Fix for performance event for flash player.
Merge branch 'hotfix/0.6.3'
Merge tag '0.6.3' into develop

0.6.3

Conflicts:
	bower.json
	package.json