For 0828;method for njit-client; 2014-02-12 by SunnyPotter
Merge remote-tracking branch 'origin/master'