Fixed bubble animation in chrome
Merge remote-tracking branch 'origin/thomas' into development
Merge remote-tracking branch 'origin/development' into thomas