'set ui-routes'
'set ui-routes'
Merge remote-tracking branch 'origin/Dennis' into Dennis
added a variable.less, and edited indention on client/index.js
initial index.js content
playing with ui-router
merged conflict
added routes and tostr config
resolved conflicts with the server side