login w/ Facebook
Merge branch 'master' into kewin_test
Merge branch 'master' into kewin_test
Merge branch 'master' into kewin_test

Conflicts:
	src/polar/obsessive/gui/MainActivity.java