Merge branch 'master' of github.com:pasosdeJesus/SIVeL

Conflicts:
	importaRelato.php
	locale/en/LC_MESSAGES/sivel.mo
	locale/en/LC_MESSAGES/sivel.po
	locale/sivel.pot
Merge branch 'master' of github.com:pasosdeJesus/SIVeL
Localizacion