Change3
Merge branch 'master' of https://github.com/martin-blaus/GatoNegro

Conflicts:
	GatoNegro/CodeTemplates/AddController/Controller.tt