fixing #365
Merge commit '8c8d9ddb20f4f45bffd18dacdc934292ec8bafec'

* commit '8c8d9ddb20f4f45bffd18dacdc934292ec8bafec':
  fixing #365
Merge pull request #366 from leider/master

Wiki shows conflicts after save
Merge remote-tracking branch 'upstream/master'
Fixing #326 Dates in Activities

Now end must be after start