Point badgetastic test page at bootstrap submodule
Merge pull request #634 from stenington/test-page-use-submodule

Point badgetastic test page at bootstrap submodule
Move some header nav into bootstrap-style dropdown
Merge branch '599-dropdown' of github.com:stenington/openbadges into badgetastic-preview

* '599-dropdown' of github.com:stenington/openbadges:
  Move some header nav into bootstrap-style dropdown
  Point badgetastic test page at bootstrap submodule

Conflicts:
	views/layout.html