* Corrected a bug
* Merged due date from ruizcompany branch
* Corrected some small bugs