synergy55inc/sef — pull request #105 by lcwork (2013-05-08 17:24:05+00:00)
Title: merge Lisa into Development

Kevin,

Could you to merge these since you have more experience dealing with the conflicts? I'm afraid I will screw something up. I'll try to figure out the merging when I have some time to play with it more.

~ lisa