internationalisation
navbar added
nav
Merge branch 'master' of github.com:IPunchu/lawkillers

Conflicts:
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
Merge branch 'master' into navbar
Merge pull request #2 from IPunchu/navbar

Navbar