Update files to 2.1
Remove old files
Remove old themes
Delete old and unused plugins
Update Consolidate plugin
Add 24 hour time locale setting
Remove Facebook and Twitter plugins
Install Medium Editor
Merge branch 'upgrade-to-2.1' into develop