Merge remote-tracking branch 'riccardo/master' into mric
Merge remote-tracking branch 'riccardo/master' into mric
update .gitignore
Merge remote-tracking branch 'riccardo/master' into mric
Merge branch 'master' of https://github.com/mfittere/SixDesk