am 43f8ccf6: am 6eb3b8d3: Merge "Upgrade the app to better follow holo guidelines"

* commit '43f8ccf63a02b28be395fd223461f1421ea2aa99':
  Upgrade the app to better follow holo guidelines