cleaning up the android code to support the new search screen.
Merge branch 'master' of github.com:joshlong/the-spring-rest-stack