Merge pull request #700 from echel0n/dev

Sync master<->dev
Merge pull request #716 from echel0n/dev

Dev
Merge pull request #718 from echel0n/dev

Dev
Merge pull request #720 from echel0n/dev

Dev
Merge pull request #724 from echel0n/dev

Dev
Merge pull request #730 from echel0n/dev

Dev
Merge pull request #732 from echel0n/dev

Dev
Merge branch 'master' into dev
Fix for Error cannot find 'cur_ep_enddate'