fixing crash when cancelling image upload in chrome
Merge pull request #406 from mozilla/405

Fixing crash when cancelling image upload in chrome
0.1.18
Fix saving/loading badge designs with backgrounds
Merge pull request #408 from mozilla/fix-image-background-error

Fix saving/loading badge designs with backgrounds
0.1.19
view for milestones tab

based on #150 && #116
Modal for Support badges
based on #150 && #116
added banner abbreviations for different cities. temporary hack solution
until we get the branding shortnames into the database.
removed some console debug statements.
First pass at milestones
Package update
Merge pull request #401 from mozilla/milestonez-150

Milestonez
0.1.20
Adding branding label to badge model
 - not technically a requirement, but in case for some reason the label changes after the badge has been created
Moving branding labels out of studio js
Updating README.
Merge branch 'master' into 407-la-dal-banners

Conflicts:
	app/models/badge.js
	app/templates/studio/index.html
Merge pull request #410 from mozilla/407-la-dal-banners

Adds shortnames to branding based on cities
Strip non-word characters from city branding config var