Commiting on server;
Merge branch 'master' of https://github.com/scubadiver124/wordpress-git

Conflicts:
	bonnyville/wp-content/themes/mobili/admin/plugins/revslider.zip
	bonnyville/wp-content/themes/mobili/admin/tgm/class-tgm-plugin-activation.php
	bonnyville/wp-content/themes/mobili/front-page.php
	draytonvalley/wp-content/themes/mobili/admin/plugins/revslider.zip
	draytonvalley/wp-content/themes/mobili/admin/tgm/class-tgm-plugin-activation.php
	draytonvalley/wp-content/themes/mobili/front-page.php
	sherwoodpark/wp-content/themes/mobili/admin/plugins/revslider.zip
	sherwoodpark/wp-content/themes/mobili/admin/tgm/class-tgm-plugin-activation.php
	sherwoodpark/wp-content/themes/mobili/front-page.php
	stalbert/wp-content/themes/mobili/admin/plugins/revslider.zip
	stalbert/wp-content/themes/mobili/admin/tgm/class-tgm-plugin-activation.php
	stalbert/wp-content/themes/mobili/front-page.php
	wainwright/wp-content/themes/mobili/admin/plugins/revslider.zip
	wainwright/wp-content/themes/mobili/admin/tgm/class-tgm-plugin-activation.php
	wainwright/wp-content/themes/mobili/front-page.php
derp
Merge branch 'master' of https://github.com/scubadiver124/wordpress-git