q
q
v

Signed-off-by: golubkov <fric@inbox.ru>
Merge branch 'master' of https://github.com/golubkov/webtools.git

Conflicts:
	src/com/progekt/webtools/MainActivity.java
change_interface_15-38