Generated users addons and testing new features
testing
Admin features added
fixin merge from pulling
Updating TODO list
Updating the last changes from production
resolving merge conflict