Added high charts
Merge branch 'master' of github.com:epintos/mediclink

Conflicts:
	app/models/ability.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
Merge branch 'master' of github.com:epintos/mediclink