enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/reallocate/reallocate

Conflicts:
	website/static/js/main.js
- added modal messaging type
- added single request cookie hack for getting alerts around redirects w/o GET param
- reactivated admin notification for new projects and reformatted email
Merge branch 'master' of https://github.com/reallocate/reallocate