add labels to projects
Merge pull request #499 from despo/add-labels-to-projects

add labels to projects :+1:
Enabling labels on the Adming;:ProjectController#edit views
I imagine you mean december....
Merge pull request #501 from jaredly/patch-1

I imagine you mean december....
Moved coderwall account to preferences
Adding archived pull requests to the API.
Merge pull request #505 from andrew/adding-archived-pull-requests-to-api

Adding archived pull requests to the API.
Adding created_at to pull request JSON.
Update the API documentaion Fixes #502
Update API documentation. Fixes #502
Merge pull request #506 from fmendez/502-update-api-doc

Update the API documentaion Fixes #502.  Dropping WIN bombs.
Move API details to a lang file

Uses "organisation" UK spelling since a existing key
already exists under that spelling.
Merge pull request #508 from randomecho/api-lang-file

Move API details to a lang file
Removing these temperamental specs as they fail.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/users/show.html.haml