fixing merge mistakes

Change-Id: I1b314ec0b940efac64d878cbf4bb2cb17ae4c372
adding line that was mistakenly removed in previous commit

Change-Id: Icf6cda22e5c8d161f7cd2f2f5f22fba6ce6eab3c
fixed equation display bugs

Change-Id: Ib0b7bdbd28e5e4cd1b20bbc58f86a306c8c60c3f
fixed infinite async task loop

Change-Id: If4b663b6e89f0252af059f9e39d5ccf641404be4
removed unnecessary error message

Change-Id: I4da361db638a63638ac07560cf6d5cfb3ad571d2
fixed null pointer error

Change-Id: I61404c12db68db26baa8e590567914b9eb6b5c7d
now behaving correctly when no column is specified

Change-Id: I516a99ed81c415a75f816f53bcf6a54022c37f83
fixed infinite async loop

Change-Id: Id1ebe59c787cd220ab69b469e528e4bb0a4563b9
Merge branch 'master' of https://github.com/IVPR/Weave into fkamayou
final touch up in sampling