Signed-off-by: N Mikhailov <kpoleg@list.ru>
Merge branch 'master' of https://github.com/JSTOo/saper_app.git

Conflicts:
	res/layout/search.xml
Signed-off-by: N Mikhailov <kpoleg@list.ru>