WIP FB Login
Merge branch 'master' into Facebook_posting_35

Conflicts:
	public/js/views/drinking-now-input-view.js
	public/templates/drinking-now.hbs
WIP
Merge branch 'Facebook_posting_35' of https://github.com/Butterfly-Assassins/secret-octo-robot into Facebook_posting_35_2

Conflicts:
	public/templates/drinking-now.hbs
Merge branch 'Facebook_posting_35_2' of https://github.com/Butterfly-Assassins/secret-octo-robot into Facebook_posting_35_2