AUTO-611
Merge branch 'auto611' of github.com:GrabNetworks/grabpress into auto611

Conflicts:
	src/includes/gp-dashboard.php
AUTO-611
AUTO-611 ajax videos working