share
Merge branch 'master' of github.com:exromany/bubblegum

Conflicts:
	protected/assets/js/controllers/frames.js