Pre-merge
Merge branch 'master' of https://github.com/seavor/fatapp into jay

Conflicts:
	webapp/modals/enterAddress.html
Merge pull request #79 from seavor/jay

Jay