Merge branch 'master' into Adam-Jones
new logout workflow along with new radio button anim
Merge branch 'Adam-Jones'

Conflicts:
	main.wire