Merge branch 'develop'
org home page fix cycle info link

and some text/appearance changes requested by kylie. closes #374
replaced last of "portal" phrasing

per kylie #374
straggler portal

#374
css hack for form errors in grants
removed form

#376
update timeline validation, display narrative q

#376
log org

#371
don't delete file on delete

bc other draft/app may be using it closes #379
draft admin modification

#380
javascript cleanup for IE

it doesn't like commas after the last item of a list #381
admin fix

#380
javascript cleanup

#381
Merge branch 'master' into develop

Conflicts:
	sjfnw/grants/models.py