Merge branch 'develop'
email template updated

per kylie. #282
additional budget file fields

#301
updated the file url util to give entire url

determines whether draft or app.  inspired by #301 extra files made old
one too long
update fileurls util to use field names
finished budget fields

including js upload/display triggers #301
updated file fields layout on grant app

closing for now pending requests. closes #346
added more fields to step admin

for debugging #349
bug fix in news creation: filter my membership

closes #349
extra filters on donor & step
started app copy process

#334
oh god redirect loop
oh god redirect loop

Conflicts:
	sjfnw/urls.py
registration bugfix

reported by karen
fixes
rollover form initial options working

#334
rollover validation working

tested local #334
a few comments/logging

#334
validate that cycle is still open when submitted

#334
added link to copy/rollover to main page

#334