casa
ok
Merge branch 'master' of https://github.com/CecliaGimeno/AD

Conflicts:
	PHolaMySql/PHolaMySql.userprefs
	PHolaMySql/PHolaMySql/Menu.cs
borr
Merge branch 'master' of https://github.com/CecliaGimeno/AD

Conflicts:
	PHolaMySql/PHolaMySql.userprefs
Merge branch 'master' of https://github.com/CecliaGimeno/AD