Added phd grants
Updated trans
Added link for phd grant
Updated phd grant section
Merge branch 'master' into django
Merge branch 'django' of github.com:SpazioDati/site into django

Conflicts:
	website.py