tag search basics
Merge branch 'master' of https://github.com/SIMS-Topaz/sims-topaz-android

Conflicts:
	android/project.properties
Merge branch 'master' of https://github.com/SIMS-Topaz/sims-topaz-android

Conflicts:
	android/project.properties
Merge branch 'master' of https://github.com/SIMS-Topaz/sims-topaz-android