latex_conf_vgtc_080216/template.tex
Merge branch 'master' of https://github.com/PANDAEMMA/AnomlyDetection

Conflicts:
	ADApp/latex_conf_vgtc_080216/template.log
	ADApp/latex_conf_vgtc_080216/template.pdf