Merge branch 'master' of https://github.com/albertonavarro/cabotrafalgar
Working improving navitation (screen navigation)
Working improving navitation (screen navigation)
Merge commit '15d98639aec8d43d76ff3c928331adcdb165341e'