Merge branch 'master' of /Dev/rails_project/ksymax_deploy with conflicts.
dif
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/_nav.html.erb