'update'
Merge branch 'master' of https://github.com/ShadowHunter/FBApp

Conflicts:
	public/js/fb.js