Merge branch 'feature/quickreport'

Conflicts:
	dist/ac-components.js
	dist/ac-components.min.js
	src/acComponents/templates/templates.js