fiddling
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf into issue141

Conflicts:
	client/app/styles/main.scss
took _ out of labels
add tabs - not updated to correct names though
merge and solve clash
added right margin to log in / out btn fixes #185
added dirty to project show fixes #183
fixes #145 a couple of tweaks to make it legit
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf into issue141
Merge pull request #194 from notionparallax/issue141

Issue141