multiple changes
Merge branch 'master' of https://github.com/danielloureda/tripping-lana

Conflicts:
	Trippinglana/src/com/dla/trippinglana/infraestructure/PersistenceFactory.java
	Trippinglana/src/com/dla/trippinglana/infraestructure/ServicesFactory.java