RELOAD Fixing merge issues and feedback url and format sent to mosync
Merge remote-tracking branch 'upstream/master'
Merge pull request #54 from bravewick/master

Sprint R5 - hardening and CEF