Merge branch 'dev'
remove testing code
Merge branch 'master' into dev