fixing merge issues
Merge branch 'master' of https://github.com/megawubs/manager

Conflicts:
	manager.py
Double or files that can't be processed are now moved to a Non-Processed-files folder
Merge branch 'master' of https://github.com/megawubs/manager