..
Merge branch 'master' of github.com:marmuel/shiny-octo-cyril

Conflicts:
	js/mylibs/script.js
dynamical labels for tax-subtotals