Merge branch 'alex_repository_display' of https://github.com/alexung/hotspot into uid_branches

Conflicts:
	app/views/repositories/show.html.erb
	app/views/shared/_note_box.html.erb
Merge remote-tracking branch 'origin/master' into uid_branches

Conflicts:
	app/views/repositories/show.html.erb
	app/views/shared/_note_box.html.erb
Uncomment branches
Remove duplicate reference to branch drop down from view
Clean up shared notes partial
Remove html from this duplicate instance of a partial and put it in the shared version as a comment in case we are going to use html instead of form for
Move html form in as comment
Remove duplicate partials
Update to include uid
Remove duplicate partials
Add change the partial on users to point at the shared sidebar
Merge remote-tracking branch 'origin/master' into fix_branch_drop

Conflicts:
	app/views/shared/_all_saved_repositories.html.erb
	app/views/users/show.html.erb
Replace form_for in place of html
remove duplicate sidebar partial call that was breaking the sidebar display
Merge pull request #95 from alexung/fix_branch_dedupe_view

Fix branch dedupe view