squash changes into one giant patch
fix downloading template
rebase to master