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

Conflicts:
	JdS/Assets/cena01.unity
	JdS/Assets/dllJDS/dll03.dll
	JdS/Assets/dllJDS/jdsDLL.dll
	JdS/DLLs/jdsDLL/jdsDLL.userprefs
	JdS/DLLs/jdsDLL/jdsDLL/deposito.cs
	JdS/DLLs/jdsDLL/jdsDLL/gerente.cs
	JdS/DLLs/jdsDLL/jdsDLL/save_load.cs
	JdS/Library/CurrentLayout.dwlt
	JdS/Library/InspectorExpandedItems.asset
	JdS/Library/assetDatabase3
	JdS/Library/expandedItems
	JdS/Library/guidmapper
	JdS/Library/metadata/90/9085870c99f751d4793c3468e9751933
	JdS/Library/metadata/92/92c25b6c39e0516478b89584ae04d5d6
	JdS/Library/metadata/eb/eb81c3dc5197c1b4c87675c9b675ed2c
	JdS/ProjectSettings/TagManager.asset