17/11/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	JdS/Assets/Fase_01_Cena_Ground.unity
	JdS/Assets/salvo/save.sg
	JdS/Library/CurrentLayout.dwlt
	JdS/Library/metadata/3c/3c872c8b4fdc2a3478847ba7b21d382a
	JdS/Library/metadata/79/796df48d933933c4aa35e33b681a9eaf
	JdS/Library/metadata/a8/a8e296356551cb0419999996071420f1
Merge branch 'master' of https://github.com/henrique-correa/Jornada-de-Sofia

Conflicts:
	JdS/Assets/Fase_01_Cena_Ground.unity
	JdS/Assets/salvo/ll.ll
	JdS/Assets/salvo/save.sg