~ fix articles and events
~ fix login cookie problem
Merge branch 'refs/heads/master' into Prod