adding locas
Merge https://github.com/sancas/html5 into locas

Conflicts:
	locas