Merge branch 'wp-lms' of https://github.com/ericdowell/wp-lms into wp-lms

Conflicts:
wp-lms.php
Changes
Changes