Add post type for slideshow
Merge branch 'master'

Conflicts:
	wordpress/wp-content/themes/starkers-master/functions.php