Updating some stuff (sorry for the meaningless comment)
Merge branch 'master' of github.com:pfs/2l2v_fwk

Conflicts:
	bin/BuildFile.xml