merging
Merge branch 'master' of https://github.com/FileStalkerDevTeam/filestalker
integrated with profile