server ip
Merge branch 'ylc'

Conflicts:
	src/nthu/qrcode/mvc/control/UserController.java