Add the fb button to the login page
Merge branch 'master' of https://github.com/leijianbin/inkstatus

Conflicts:
	app/design/frontend/default/grayscale2014/layout/fblogin.xml