litup013_done
Merge branch '#litup013'

Conflicts:
	common/top_area.tpl