Issue #24: using new VERSION file
Merge branch 'master' of github.com:kpdyer/fteproxy

Conflicts:
	Makefile