removed DEVKEY
Merge branch 'dev' into design