Now gets all common things
Added new html file
Tried integrating social graph
Merge branch 'master' of github.com:TN1ck/aal

Conflicts:
	aal/public/angular/app/scripts/controllers/main.js
	aal/public/angular/app/scripts/directives/widget.calendar.js
	aal/public/angular/app/scripts/services/widget-data.service.js
	aal/public/images/user-2.png