Merge branch 'master' of https://github.com/Gawvie/MintMediaHotelApp

* 'master' of https://github.com/Gawvie/MintMediaHotelApp:
  Update home_test.xml
  Create setting.xml
  Update SlideActivity.java
  Update Setting.java