Merge tag 'v2.1' into dev

2.1
Merge tag '2.1.1' into dev

2.1.1
Merge tag '2.1.2' into dev

2.1.2
Merge branch 'hotfix/2.1.3' into dev
Merge tag '2.1.4' into dev

2.1.4
Update list_event.php

This sloves the problem with the delete button that does nothing.
Merge branch 'tigerxy-patch-1' into release/2.1.5
fix some bugs
Merge branch 'release/2.1.5'