Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	app.yaml
limit div height in blocks

#323
scroll when loading mult step form

fixes #278
eligibility info on home page

#303
mild update for fund reset email

#282
removed leading 0s from date/times

per kylie request
added links to admin
Merge branch 'master' into develop