Updated architecture
Merge branch 'master' of github.com:lieberkind/jsreport