Allow restrictions on project identifiers to be disabled
Merge branch 'master' of mwoodbri.github.com:mwoodbri/MRIdb

Conflicts:
	app/views/Application/study.html