Minor UI changes
Merge branch 'ui' of http://github.com/mattlemmone/b_sync into ui
UI updates, minor changes
Merge branch 'ui' into Login_Support

Conflicts:
	public/javascript/sockets.js
	views/index.jade