NdevBox update from IBM-T61
Merge branch 'NDevBox' of github.com:fvl/Chat2014 into NDevBox