up
Merge branch 'master' of https://github.com/oldfritter/upmp

Conflicts:
	lib/upmp/service.rb