fixed Makefile
updated .gitignore
fixed node client
fxos: load contacts from external file
added screencast link
merged master