fazendo pull
Merge branch 'master' of https://github.com/solfier/agendaFisio-Rails4

Conflicts:
	spec/helpers/application_helper_spec.rb
refactored patient model tests to use FactoryGirl
add appointment model tests