Merge branch 'master' of /Users/kishorechandra/LWS_AD-1 with conflicts.
<Reverted back >
cause failure of data....
test_sell_form,
test_sell_form2

added for form options in HOME and APARTMENT