casing mergehell :)
Merge branch 'master' of github.com:fliphess/ServerAgent

Conflicts:
	client/modules/packages.py