Merge branch 'master' of github.com:JLiljegren/MavensMate-Templates

Conflicts:
	package.json
Merge branch 'master' of github.com:JLiljegren/MavensMate-Templates

Conflicts:
	package.json