Search bar and search page
Merge branch 'master' of https://github.com/YADev/wordpress

Conflicts:
	wp-content/themes/twentytwelve/footer.php