Practices Jul 08 2014
Merge branch 'feature/thinh' into develop