Merge branch 'hierarchical-projects-base' of https://github.com/rodrigods/keystone into hierarchical-projects-base

Conflicts:
	keystone/assignment/core.py
Merge branch 'hierarchical-projects-base' of https://github.com/rodrigods/keystone into hierarchical-projects-base

Conflicts:
	keystone/assignment/core.py