Comment an unused variable
Solve a merge conflict
put the size to folders
move the token because it was generating a new token before validate - refs BT#7890
Merge pull request #22 from DeEvo/1.9.x

put the size to folders and move the line where the token is generated.