event edit
no message
Merge branch 'master' of https://github.com/Cmadmin/totalhr.com

Conflicts:
	totalhr.v11.suo
	totalhr.web/Content/css/popup.css
	totalhr.web/Views/Calendar/EventAdd.cshtml
further changes