#131: Navigation markers pattern demo now works
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo/navigation/index.html
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:Patternslib/Patterns
Merge branch 'master' of github.com:Patternslib/Patterns