Add github profile to user
Merge branch 'add_github_login' into 2014

Conflicts:
	app/views/cfp/application/_formatted_proposal.html.haml