almost
Merge branch 'master' of github.com:duffcodester/digiquatics into active_nav_links

Conflicts:
	app/helpers/application_helper.rb
Added active links closes #926.
Merge pull request #927 from affektive/active_nav_links

Active nav links