_G and _N Prefix
Merge branch 'master' of https://github.com/signumsoftware/framework

Conflicts:
	Signum.Entities/Translations/Signum.Entities.es.xml