Merge pull request #19 from ifearcompilererrors/master

Merge
Merge branch 'master' of github.com:aronasorman/kalite-internal into feedback
Merge remote-tracking branch 'upstream/feedback'
feedback form
view for feedback form
forbid user to create feedbacks for projects they are not part of
remove the logged in user from the possible targets for feedback
fix layout of create feedback template
complete feedback adding logic
Changed up CSS and base template
Changed up the CSS and deleted profile_index

Placed more things into the base template
Merge pull request #21 from ngovkevin/master

Changed up Base template and CSS for profile view
Merge branch 'feedback' into angelique/master

Conflicts:
	internal/feedbacks/urls.py
	internal/feedbacks/views.py
	internal/internal/urls.py
	internal/projects/views.py
Merge remote-tracking branch 'origin/master' into feedback

Conflicts:
	internal/internal/static/css/stylesheet.css
fix details in projects.views
make feedback_averages function in team member model
Merge remote-tracking branch 'origin/feedback' into feedbacks

Conflicts:
	internal/feedbacks/urls.py
	internal/feedbacks/views.py
	internal/projects/urls.py
	internal/projects/views.py
	internal/templates/base.html
Merge pull request #3 from aronasorman/feedback

Feedback