11-22
Merge branch 'mainServer' of http://github.com/lhr530124/nozomiServer into slave

Conflicts:
	startApp.sh