Merge branch 'master' of https://github.com/tesis2014/tesis

Conflicts:
	TesisAplication/web/WEB-INF/faces-config.xml
Merge branch 'master' of https://github.com/tesis2014/tesis into HEAD