Merge branch 'hotfix/fix_make_up_3' into develop

* hotfix/fix_make_up_3:
  fix make up n events
edit gitignore
remove .swk files
fix redirect after update report
Merge branch 'release/1.8.2.2'

* release/1.8.2.2:
  fix redirect after update report
  remove .swk files
  edit gitignore