fix
Merge branch 'master' of github.com:designhunger/engine

Conflicts:
	lib/locomotive/liquid/tags/nav.rb