Minor bug fixes in code and Calatrava both. Also configured google play services as a referenced library project to ensure that we can use map fragments