Merge remote-tracking branch 'origin/master'

Conflicts:
	Lab3.gise
	TOP_summary.html
	_xmsgs/pn_parser.xmsgs
	iseconfig/Lab3.projectmgr
	iseconfig/TOP.xreport
	xst/work/work.vdbl
	xst/work/work.vdbx