removing obj and *.user file as they constantly cause conflicts and shouldn't be committed
Merge branch 'master' into denis1