Renamed
Rename again
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/js/drop-down-nav.js