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

Conflicts:
	src/com/comfymobile/saadat/activity/DetalActivity.java
Signed-off-by: N Mikhailov <kpoleg@list.ru>
Merge branch 'master' of https://github.com/JSTOo/saper_app.git
Signed-off-by: N Mikhailov <kpoleg@list.ru>