Merge branch 'master' of github.com:rapidftr/RapidFTR

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb