Security updates for a couple of provided modules.
Rolling back changes to match panopoly beta4.
Adding back in display suite to bypass app incompatibility issues.
Issue #1619760 by mrf: Adds profile to the manual make file.
Dropping explicit dependency on better formats to match panopoly.
Updating make files to track Panopoly beta4, dropping remote include until #1427752 is resolved.
Checking the variable more explicitly
Helping to set the memory higher if possible. 196M minimum.
Adding Font Replacement Module Since It Has Been Removed from Panopoly
Merge branch '7.x-1.x' of git.drupal.org:project/openacademy into 7.x-1.x
