aSa
Merge branch 'master' of
ssh://git@github.com/ratinmalkud/PowerSearch.git

Conflicts:
	PowerSearch/project.properties
	PowerSearch/res/layout/activity_audio_search.xml
	PowerSearch/res/layout/activity_verify_audio.xml