Bug: asdajshdkajshdkjahsd

asdasdajhsgdjahsgdjhasgd
Merge branch 'b_fixing_login_error' into develop
US: Repost generation

Adding basic template to generate reports
US: Report generation

Using basic template to generate customer reports
US: Stock management

- List articles
Merge branch 'f_reports_generation' into develop
US: Stock management

- Removing no longer needed articles
Merge branch 'f_stock' into develop
ÚS: Adding stock languages

- Adding languages basic list
US: newincoporation

_ hoodokd  dnfdf
Merge branch 'f_stock_incoporation' into develop
US: Adding stock languages

- Adding indentation
Merge branch 'f_stock_languages' into develop

Conflicts:
	stock/stock.txt
Merge branch 'develop'