CRM-15193 - Set userFrameworkFrontend before adding core resources in WP
Merge pull request #49 from colemanw/4.5

CRM-15193 - Set userFrameworkFrontend before adding core resources in WP
Merge pull request #50 from civicrm/4.5

Merge branch 4.5 into master