Adding a point of Genie integration, and updating log4j dependency
Merge remote-tracking branch 'upstream/master'
Now using LIPSTICK_UUID_PROP for uuids
Merge pull request #27 from sriramkrishnan/master

Adding a point of Genie integration, and updating log4j dependency