LIVEOAK-128 several fixes on data collection page
Merge pull request #138 from vrockai/COLCRUD2

LIVEOAK-128 several fixes on data collection page