Merge origin/master

Conflicts:
	resources/log.txt
Merge origin/master

Conflicts:
	resources/log.txt
Merge origin/master
Security added to the transfert
User and Manager can not change the source branch
Admin can change the source branch