sync back with git
conflicts in shortcoder.js fixed
sync
Merge branch 'master' of https://github.com/andreimarin90/dailynews
Merge branch 'master' of https://github.com/andreimarin90/dailynews
sync now
video post fix