Sync Ivan changes to dev
Merge branch 'master' of github.com:jrodwell/ballball

Conflicts:
	wp-content/themes/ballball/home.php