Merge pull request #555 from jaypoulz/jp508

Jp508 -- Found and fixed more bugs! Data Saving is now functional!
Logo work for Data Collector