Merge branch 'develop-testingupdates'

Conflicts:
	sjfnw/templates/admin/index.html
using version 2 to be safe
made some updates to code; need testing. #587
split screening status up, some for admin some for GP #587
new and updates fixtures #587
removed obsolete form
Merge branch 'feature-transition' into feature-multgp

Conflicts:
	sjfnw/grants/models.py
updating fixtures #587
added missing import
fixed refs to modelforms
imports
bugfixes: searching org name in apps, listing sponsored grants without check_mailed. #330
bugfix: in org report, get gp awards even if apps aren't selected
updating fixtures for #56, also added a bit to them
updates to get tests working again #56. reporting still needs overhaul
got reporting tests working; still several fields missing. #578
updated project-app code #578
renamed
put coverage report in html
starting on admin changes; working projectapp inline on app #578