name updated
name updated
Merge branch 'master' of https://github.com/KGIS/Repository2.git

Conflicts:
	AndroidDemo4/src/com/example/androiddemo4/MainActivity.java
ok
hula laaaaaaa
Merge branch 'master' of https://github.com/KGIS/Repository2.git
commited