added default user
fixed sqls
Merge branch 'new_branch_name'

Conflicts:
	WEB-INF/src/com/astrider/sfc/src/helper/WeeklyLogUtils.java