Merge branch 'master' of https://github.com/Buooy/wp-maintenance-coming-soon

Conflicts:
	admin/assets/css/admin.css
	admin/assets/js/admin.js
	admin/class-wp-mcs-admin.php
	admin/views/admin.php
	public/class-wp-mcs.php
	themes/default/coming-soon.php
Merge branch 'master' of https://github.com/Buooy/wp-maintenance-coming-soon

Conflicts:
	admin/assets/css/admin.css
	admin/assets/js/admin.js
	admin/class-wp-mcs-admin.php
	admin/views/admin.php
	public/class-wp-mcs.php
	themes/default/coming-soon.php