Merge remote-tracking branch 'origin/master'

Conflicts:
	App Móvil/ConnectionDB
	App Móvil/ConnectionDB.lua
	App Móvil/code/ConnectionDB.lua
	App Móvil/home.lua
	App Móvil/menu.lua
	App Móvil/registration.lua
	App Móvil/welcome.lua