Cleaned up base.html
Finished the Badges for Team Members

Created badges table as well as badge attribute for team members. May
add images to the badges later. Also added badge fixtures to json
object.
Deleted Swap and got rid of comments :)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	internal/initial_data.json
	internal/templates/base.html
	internal/templates/profiles/profile.html
Move account stuff to the right on the main nav bar like in Google,FB etc
Fixed display of the badges.
Make nav bar highlights responsive to the page its in
Implement frontend and minimal backend for password changing
Change documentation of a function
Merge pull request #31 from ngovkevin/master

Made the changes that were asked from the previous pull requeset
fix feedback link
Merge pull request #32 from pnpranavrao/userlogin2

Change password settings and fix Navbar stuff
Bug fix for project creation

Fixed error message that showed when creating new project. Set project
owner as the one who created the project. Deleted collaborators
selection when creating project.
integrate south
Revert "Bug fix for project creation"

This reverts commit e894bdd08a53f2fae6acbb27349f8114732f8f18.
Fix for project creation

Fixed error message when creating new project. Set project owner to the
person who created the project automatically, collaborators selection
removed.
Update views.py
Merge pull request #34 from asilvaC/master

Bug fix for project creation
login page redirects correctly to url pointed by next parameter
Merge branch 'master' into south