Merge branch 'master' of https://github.com/rimasg/public

Conflicts:
	NetworkActivity/res/layout/main.xml