Merge branch 'index'
'searching team' working
creating-project-without-team
Only the project owner can add team members
Merge branch 'searching-team' into nightly
Merge branch 'create-project-without-team' into nightly
Merge branch 'add-team' into nightly

Conflicts:
	controllers/default.py