version in CHARM

Conflicts:
	.gitmodules
	ip_cores/general-cores
	ip_cores/gn4124-core
	ip_cores/wr-cores
	rtl/fmc_masterFIP_core.vhd
	rtl/fmc_masterFIP_mezz.vhd
	rtl/fmc_masterfip_csr.vhd
	rtl/masterFIP_pkg.vhd
	rtl/masterfip_rx.vhd
	rtl/masterfip_tx.vhd
	rtl/wbgen/fmc_masterfip_csr.wb
	sim/spec/data_vectors/masterFIP_test.vec
	sim/spec/testbench/tb_masterFIP.vhd
	syn/spec/spec_masterfip_mt.xise
	top/spec/spec_masterFIP.ucf
	top/spec/spec_masterFIP.vhd