ok
Merge branch 'master' of https://github.com/nguyen-phuoc-mulodo/timchoi

Conflicts:
	Source/ci/nbproject/project.xml
ok
ok
change in linux