Atributes, getters, setters, constructors for users classes
Merge remote-tracking branch 'origin/master'