Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
changed code to handle loading collections
listening for data to be loaded
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink into jeff-develop

# By Simon Spencer (6) and others
# Via Simon Spencer (2) and others
* 'jeff-develop' of https://github.com/jeffreybaird/clink:
  updates to homepage
  Latest UI Push
  working
  moved inner app wrap
  updated chatview view
  new assets and styled app chrome
  bootstrap
  UPDATECSS
  Update ChatView View
  Updated main.less | chatview view
  removing unwanted basics from markup/css
  chatview and hp pages

Conflicts:
	client/routes/chatRoute.js
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
switching to store chat info by id
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
fixng a spelling mistake
limit chat push on the server side
merge
Add nicknames
Merge nickname fixes
Change your nickname when you leave nickname field
fixing that spelling error once more
Make URLs case-insensitive
Merge pull request #1 from jeffreybaird/jeff-develop

Jeff develop
merge