Merge branch 'Ishin'
-fixed small syntax errors.
Merge branch 'master' of github.com:YfLn/CEN3031FA14
-View User page displays user portfolio properly again
minor changes
fixing conflict
Merge pull request #82 from YfLn/yufan

can signup user but wont signin automatically, getting internal error(500), need to discuss more about req.user usage; Question: Should we make a verify password input for signup view?
Merge branch 'Ishin'
datashellTest insert with java Test
Merge branch 'master' into Ishin