Conflicts:
	Gemfile.lock

Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee

add username to team_member page

replaced system() calls with FileUtils.* methods

Fixed typo of recipes (recipres) in development fixtures

better labels

This also makes that 'mv: cannot stat `/ho..' is not shown in the test :)

consistent spacing

require fileutils

Revert "require fileutils"

This reverts commit 54313d3bbaa60cfc5b405be50cc00b7f6b0cb715.

new hash notation

FileUtils.mv in begin/rescue block

Remove models/roles and return to fat models