sheep!
figtest conflict resloved
Merge branch 'sharelatex-2014-10-21-1436'