Merge branch 'master' of https://github.com/klimentLambevski/finansii

Conflicts:
	app/package.json