added patient history spec
updated user model
added more specs in user model
Merge branch 'testing' into development

Conflicts:
	spec/models/user_spec.rb