Signed-off-by: Minh Bao <baosmart@gmail.com>
Merge branch 'master' of git@github.com:minhbaotmb/BAFO.git

Conflicts:
	BAPOManager/CFManager.bak

Signed-off-by: Minh Bao <baosmart@gmail.com>