new
Merge branch 'master' of https://github.com/vhdluj/ATLAS

Conflicts:
	l1topo_kintex7/ddr/ddr_input_module.vhd
	l1topo_kintex7/ddr/ddr_links_wrapper.vhd
	l1topo_kintex7/general/top_L1TopoController.vhd
Merge branch 'master' of https://github.com/vhdluj/ATLAS

Conflicts:
	l1topo_kintex7/ddr/ddr_input_module.vhd