sync
Merge branch 'master' of https://github.com/fasquelito/DevOO

Conflicts:
nbproject/private/private.xml
Commitage