Updated HEAPS of stuff
Merge branch 'master' of https://github.com/jarradspring/soulrevivalchurch-theme

Conflicts:
	less/style.css
	less/style.less
	whatson.php