Fix user's avatar and displayName.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/business/main/directives/HeaderDirective.js
	app/business/main/directives/LoginDirective.js
	app/business/main/services/AccountDaoService.js
	app/business/main/services/AccountService.js
	app/business/main/templates/header.html
Merge pull request #20 from ivanzhaowy/master

Fix user's avatar and displayName.