Updated features to the 2.x branch
Stream line of make file
Merge branch 'development' of github.com:ding2tal/ting_material_details into development