update by haidong
update by haidong
update by haidong
update by haidong
update by haidong
update by haidong
update by haidong
update by haidong
Merge branch 'master' of github.com:haidong2014/easysims

Conflicts:
	application/resource/sql/create_all.txt
update by haidong
update by haidong
update by haidong
Merge branch 'master' of github.com:haidong2014/easysims

Conflicts:
	application/controllers/class_c.php
	application/models/class_m.php
	application/resource/sql/create_all.txt