User edit
Merge pull request #6 from Drorzz/dev-drorzz

User edit
Merge pull request #7 from Drorzz/develop

Develop