nozomi
not abort
Merge branch 'mainServer' of github.com:lhr530124/nozomiServer into mainServer

Conflicts:
	startApp.sh
Merge branch 'mainServer' of http://github.com/lhr530124/nozomiServer into slave

Conflicts:
	startApp.sh