Issue46 fix
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team2
Modified USER_ACTIVATION_TIMEOUT to USER_ACTIVATION_TIMEOUT_SECS for issue46 fix
Merge branch 'issue46'
Fixed merge conflict with main repository
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team2
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team2
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team2
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team2
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team2
Merge branch 'master' of https://github.com/giornaledisistema/share-system-team2
Fixed argparse problem when it use commands without arguments
Merge branch 'master' of https://github.com/giornaledisistema/share-system-team2
Merge pull request #76 from giornaledisistema/master

Argparse command without argument
Merge branch 'master' into peewee