Massive clean up
Lukes and Cathals latest code merged
new
Temp
Merge remote-tracking branch 'origin/branch_LW_20140316' into branch_LW_20140316