Add Server
Merge branch 'master' of https://github.com/Declose/mt2

Conflicts:
	.meteor/packages