Add custom bubble.
Merge branch 'master' into release/2014.10.12
Update compiled files