Remove New Relic references
Remove terms of service clickthrough
Merge branch 'master' of https://github.com/r888888888/danbooru
Merge branch 'master' of https://github.com/r888888888/danbooru

Conflicts:
	Gemfile.lock
	app/assets/javascripts/cookie.js
Update Gemfile.lock
Merge branch 'master' of https://github.com/r888888888/danbooru
Merge branch 'master' of https://github.com/r888888888/danbooru
Merge branch 'master' of https://github.com/r888888888/danbooru
Merge branch 'master' of https://github.com/r888888888/danbooru
Merge branch 'master' of https://github.com/r888888888/danbooru
Merge branch 'master' of https://github.com/r888888888/danbooru
Merge branch 'master' of https://github.com/r888888888/danbooru

Conflicts:
	app/assets/javascripts/cookie.js
Obey RAILS_RELATIVE_URL_ROOT in config.ru
Use Rails URL helpers instead of hardcoded links
Merge branch 'master' of github.com:r888888888/danbooru
Restrict post-login redirection targets to local URLs