Added serach by activity name
Merge branch 'master' of https://github.com/badunacodruta/android-cycling

Conflicts:
	cycling-webapp/src/main/java/org/collaborative/cycling/webapp/controllers/TrackingController.java