Merge branches 'master' and 'devAST'
Merge branches 'master' and 'devAST'
Merge branches 'master' and 'devAST'
removed unneccessary files
Merge branches 'devAST' and 'master' into devAST