bull
Revert 357d144..574721d

This rolls back to commit 357d144a7681b73dff1f1c05cbbcb647c68b994a.
Revert 574721d..24ad6f4

This rolls back to commit 574721da3eb271381d4d55289f3f9b4f0f63924e.
broken
Revert 8bd55db..04f208a

This rolls back to commit 8bd55db4eebd9314ab10dfcdd33645f4ca75ef3d.
minor ui change
Merge branch 'master' into stable