Wordpress Update
User Role Plugin Update
Merge https://github.com/gmmateev/charity into origin
Merge https://github.com/gmmateev/charity into origin
Merge https://github.com/gmmateev/charity into origin

Conflicts:
	wp-includes/js/tinymce/plugins/compat3x/css/dialog.css
	wp-includes/js/tinymce/skins/lightgray/img/trans.gif
Removed the sidebar