Change -l flag for saving data to more logic -s
Add scripts to load CSV data from shell prompt
Merge remote-tracking branch 'upstream/develop' into develop