fix compile warning
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel

Conflicts:
	src/cvac/corpus/CommonDataSet.java
changes for new binary packing with python dist
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel
added custom NSIS install to binary package, had it install python site-packages, put easy.py back
Merge pull request #72 from sorflex/devel

binary install changes and put easy.py back