Social graph finished
Merge branch 'master' of github.com:TN1ck/aal

Conflicts:
	aal/public/angular/app/views/idle.html
Fixed small issues caused by merge