Merge branch 'master' into plugins

Samo Penic

2019-02-27 d2f3609e9ecec5ec8dc02a992a6ec98e28ca9c6d

 src/energy.c

@@ -240,5 +240,5 @@
}

void stretchenergy(ts_vesicle *vesicle, ts_triangle *triangle){
   triangle->energy=vesicle->tape->xkA0/vesicle->tlist->n/2*pow((triangle->area/vesicle->tlist->a0-1),2);
   triangle->energy=vesicle->tape->xkA0/2.0*pow((triangle->area/vesicle->tlist->a0-1.0),2);
}