changed the file for test
changed tpn model and wrote specs for tpn model
changed user model and wrote specs for it
added tpn_market_additive spec file
deleted admin, role specs
removed email vaidation comment
wrote user model specs
modified tpn_spec.rb
added role and admin spec files
added patient history spec
added patient history spec
updated user model
removed mail delivery in test config file
added more specs in user model
cleaned the code
Merge branch 'testing' into development

Conflicts:
	spec/models/user_spec.rb
added user spec using factory
added specs using factory girl
added specs using factory girl
removed logs