change conf parse
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/common/directive/templates/user_bar.html
	static/my_name_card/my_name_card.html
change conf parse
Merge remote-tracking branch 'origin/master'