issue
Merge branch 'master' of https://github.com/xianlewang/team17

Conflicts:
	portfolio/portfolio/integration_test/integration_tests.txt~