Particulilles
Merge branch 'develop' of https://github.com/jaumefc/pretigawa into develop

Conflicts:
	merged/assets/placa.unity
	merged/assets/scripts/triggerCamera.cs