work in progress check in
=bunch of updates
Merge pull request #1 from francimedia/develop

Develop