ADFrame.py
Merge branch 'master' of https://github.com/PANDAEMMA/AnomlyDetection

Conflicts:
	ADApp/ADFrame.py
	ADApp/ADFrame.pyc