Merge branch 'master' of https://github.com/AlvarezAriel/unq-persistencia-aterrizar

Conflicts:
	src/test/scala/AerolineasSpec.scala