Reorganize Application Layout
Break templates into composable blocks
Merge branch 'master' of github.com:grevian/AppEngine-Example into deferred

Conflicts:
	index.html