fix cibtikker package name
fix cibtikker package name
Merge origin/master

Conflicts:
	New Folder/WAMP_blog_engine/src/main/java/cs544/wamp_blog_engine/controller/UserController.java