removed client_id
removed client_id
like, follow etc
Merge branch 'master' into gh-pages

Conflicts:
	.idea/workspace.xml
	app/index.html
	app/scripts/controllers/main.js
blah
merge