remove GIT part 1
resolve config_url problems
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	app/controllers/config_controller.rb
	app/views/config/index.html.erb
	config/routes.rb