sync
Merge branch 'master' of https://github.com/lpeancovschi/emed

Conflicts:
	app/controllers/appointments_controller.rb
	db/development.sqlite3