merge source code to the last version
Merge branch 'master' of https://github.com/thingtrack/Konekti-Platform.git