Differentiate between userFolder and homeFolder
Load configuration from user's home folder
User ID must be lowercase
Merge branch 'master' into multiUser