dev-beason:Nav bar fix
dev-beason: updated core.js
Merge branch 'dev-slider' into dev

Conflicts:
	js/core.js