1d bar updated
Merge branch 'master' of https://github.com/simvisage/simvisage.git

Conflicts:
	ibvpy/ibvpy/cntl/displ_avg/bar1d_damage.py
Merge branch 'master' of https://github.com/simvisage/simvisage.git
Merge branch 'master' of https://github.com/simvisage/simvisage.git
just a comment
Merge branch 'master' of https://github.com/simvisage/simvisage.git