mp addon backup
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
designer
pkgr
pkgr
pkgr
pkgr
Merge pull request #68 from thomasalrin/master

pkgr