merge fixes.
merge fixes and model adjustments
Merge branch 'provider_pravin_karan' into admin_pradeep
cancan gem added
conflicts resolved