git strangeness
Daily Commit 4/7
Daily commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/assets/css/admin.css
	admin/class-mpp5-wp-admin.php
	admin/views/admin.php
	includes/mpp5-wp-common.php
	mpp5-wp.php
	public/assets/css/public.css
	public/assets/js/public.js
	public/class-mpp5-wp.php