Upgrade bottle to version 0.12.7
Remove non-necessary : after end in template errors/index.tpl
Fix %rebase in templates for bottle 0.12
Fix %include in templates for bottle 0.12
Change mustache delimiter to {%, as <% is now used by bottle
Fix 404 page with bottle 0.12
Merge branch 'bottle-0.12'