15/07/2014 commit

2 weeks' work: 1f~1h; partial 3a; 3b~3c; 5e; 8b~8c