minor changes
minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.rb
	app/config/config.rb
	app/models/testrecorder.rb
	app/routes/browser.rb