Merge branch 'hotfix/1.0.2' into develop
Updated to WordPress 3.8
Merge branch 'release/updatedVersion38'