Made Services
Merge branch 'master' of https://github.com/andersonf/madesoftware

Conflicts:
	MadeWeb/conf/messages.en