Minor changes.
Merge branch 'master' of http://github.com/Zoulz/birfengine

Conflicts:
	build.xml
Fixed generate-docs target in ant build script.