Merge branch 'master' into John
small style changes and working on reconnect

small style changes and working on reconnect
footer style

footer style
Merge branch 'John'