Merge branches 'master' and 'ldinh-dev'
removing test file
Merge branches 'ldinh-dev' and 'master' into ldinh-dev
Adding something