New design
Merge branch 'master' into blaze

Conflicts:
	smart.lock