cap nhat quy dao chuyen dong

viet them phan su ly va tram

Merge branch 'master' of
https://github.com/phat-trien-phan-mem-phan-tan/dynamicpool

Conflicts:

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/model/DevideInfor.java

sdsdas
Merge branch 'master' of https://github.com/phat-trien-phan-mem-phan-tan/dynamicpool