Maj Softcard/smartcard
Merge branch 'sc' of https://github.com/smartSocialNetwork/project into sc