Friends list view
Merge branch 'master' of https://github.com/kveskimae/tw-challenge-2014

Conflicts:
	app/index.html
	app/scripts/app.js