Merge branch 'release/2.0'
Merge branch 'develop' of github.com:srtfisher/Lockdown-WPAdmin into develop