Merge branch 'master' of https://github.com/SocialERPTelegestion/SocialPlaZa

Conflicts:
	SocialPlaZa/WebFolder/scripts/fcscript.js
arreglao