- Activity_chart.xml
- Porfolio pie chart
Merge remote-tracking branch 'origin/master'

Conflicts:
	cmov_finance/Cmov_financeProject/Cmov_finance/src/main/java/feup/cmov/finance/share/PortefolioActivity.java
	cmov_finance/Cmov_financeProject/Cmov_finance/src/main/java/feup/cmov/finance/stock/Portfolio.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	cmov_finance/Cmov_financeProject/Cmov_finance/src/main/java/feup/cmov/finance/share/PortefolioActivity.java
	cmov_finance/Cmov_financeProject/Cmov_finance/src/main/java/feup/cmov/finance/stock/Portfolio.java