update framework files
Merge pull request #95 from ICTKyouikukei2013/kamiya/framework

update framework files
conflict
edit slide #7, 15