�e�X�g�X�V
�F�B���X�g�Q�Ɓ@�ǉ�
Merge branch 'master' of github.com:upartner/upartner

Conflicts:
	app/views/layouts/_header.html.erb