fw changes
Freewheel special setting
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

Conflicts:
	app/views/layouts/_head.html.haml
	db/schema.rb
	lib/support/rewrite-hooks.sh
	resque.sh
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq