Merge pull request #69 from danuzclaudes/development

12/4/2014 Master - Development
Merge pull request #3 from danuzclaudes/master

12/4/2014 chongrui - Master
Merge pull request #4 from 54wang17/chongrui

Chongrui
sort
Merge pull request #5 from 54wang17/development

sort
Merge pull request #70 from 54wang17/master

12/4/2014 Master - 17master
Merge pull request #71 from danuzclaudes/master

12/4/2014 Development - Master