Draw graph completed
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/assets/javascripts/app.js
	app/assets/javascripts/application.js
	app/views/users/show.html.erb
	config/routes.rb