maj DAL
Merge branch 'master' of http://github.com/smartSocialNetwork/project