new beos
resolve conflic
Merge branch 'master' of github.com:apirak/apirak_test_git into patch