updated archived function
add display time for post
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/board.jsp