merge RouteListFragment.java and SearchFragment.java
Merge branch 'master' of https://github.com/aristosh/hackjak

Conflicts:
	src/com/kiri/hackjak/SearchFragment.java
	src/com/kiri/hackjak/db/TrayekWaypoint.java