file.js
admin menu hiding plugin + user edit form
Merge branch 'master' of https://github.com/grzesiekdawid/mal

Conflicts:
	wp-content/plugins/woocommerce/assets/css/woocommerce.css
	wp-content/plugins/woocommerce/assets/css/woocommerce.less
	wp-content/themes/matheson/header.php