tj up to date
User's avatar is immediately displayed in profile
pre merge
Added fake courier stats
Collapsible sub-sections for dashboard pane
Fixed image upload
Merge branch 'master' into betterAvatar

Conflicts:
	app/scripts/controllers/main.js
	app/styles/feed.css
Merge pull request #59 from tcb-hr/betterAvatar

Better avatar
Merge branch 'master' of https://github.com/tcb-hr/feed
utd
Display image preview immediately
Merge pull request #60 from tcb-hr/photoUpload

Display image preview immediately
css
Merge branch 'master' of https://github.com/tcb-hr/feed into twinjet
css
cssssss
cssssss
cssssss
scale
stream