Try to fix gitignore, Brez's one doesn't work :/
Adding upload for avatar/tumbnail, bugfix, a others... x)
Resolve M*ther F*cking big conflict ! :D