Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/tikitoo/servlet/UserServlet.java
Merge remote-tracking branch 'origin/master'