ナヴィバーとエディット設置
Merge branch 'master' of https://github.com/noboo/starkers-bootstrap

Conflicts:
	starkers-master/parts/shared/header.php