nanoCloud test
-
fixBud missing ip_addr: reregister updateWatcher
-
Merge branch 'master' of https://github.com/puniverse/galaxy

Conflicts:
	build.gradle