pul time
added populate user
Merge remote-tracking branch 'origin/master'

Conflicts:
	mysite.log
added populate user