them file admin,lecturer
Merge branch 'master' of git://github.com/heroandtn3/bksmooc

Conflicts:
	.classpath
Hoan thien cac lop entity Model