Cancel & Submit Buttons for avatar upload
Added resetAvatarControls()
Merge branch 'master' into photoUI

Conflicts:
	app/styles/feed.css
Merge pull request #63 from tcb-hr/photoUI

Cancel/submit/preview for avatar upload
Corrections to spaces, alignment, quotes. Refactor of jQ to JS.
Merge branch 'master' of https://github.com/tcb-hr/feed

Conflicts:
	app/scripts/controllers/main.js
Merge pull request #64 from janaspage/master

Code tidying.
stream db merge
merge master