Friend List Added
Merge branch 'master' of https://github.com/ducdigital/s42m

Conflicts:
	www/js/app.js