deploy
deploy
deploy
deploy
first push for nkcr!
user && session
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	config/environments/development.rb
Design: banner, header, container
page edition
Mapbox, markerCluster, TileMil
map update
head mobile viewport
tables
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/views/pages/home.html.erb
home design
admin tables
map update, design /reseau
wizard expiration
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/views/layouts/_header.html.erb
	config/routes.rb
deploy