Merge branch 'master' of https://github.com/ziguri/tecnoapi

Conflicts:
	web/index.xhtml