* fix bug on task 14/11/2013
- revert change for conflict
- fix conflict
* fix conflict shit file
* fix all bugs in Snapshot