temp update
Merge branch 'mainServer' of http://github.com/lhr530124/nozomiServer into testServer

Conflicts:
	startApp.sh