0425 usercontroler doput
Merge branch 'ylc'
Merge branch 'ylc'

Conflicts:
	src/nthu/qrcode/mvc/control/UserController.java
0425 mysql INSERT get uid
Merge branch 'lowlow'
Merge branch 'ylc'