Merge branch 'hotfix/Valuation' into develop

Conflicts:
	Transactions/models.py
	Transactions/tests.py
Merge branch 'develop' of github.com:danst0/Portfolio into develop

# By Daniel
# Via Daniel
* 'develop' of github.com:danst0/Portfolio:
  retirement forecast with chart

Conflicts:
	core/views.py