more model funtions for generate template
Merge branch 'develop' of http://github.com/point-of-sales/pos-project into develop

Conflicts:
	source/protected/modules/quanlynhanvien/controllers/NhanVienController.php
	source/protected/modules/quanlynhanvien/views/nhanVien/_form.php
	source/protected/modules/quanlynhanvien/views/nhanVien/_search.php
	source/protected/modules/quanlynhanvien/views/nhanVien/admin.php
	source/protected/modules/quanlynhanvien/views/nhanVien/capnhat.php
	source/protected/modules/quanlynhanvien/views/nhanVien/them.php
	source/protected/runtime/application.log