Code clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	av_con_ec/WebContent/nav.html
	av_con_ec/src/av_con_ec.java