Merge pull request #2 from friendica/master

Sync with upstream
If entered event info is not valid, let user try again with the old info still there. Closes friendica/red#648
Merge pull request #655 from pafcu/master

Better handling of incorrect info entered in event