fixes
fixes
Merge branch 'master' of https://github.com/nawlbergs/seed

Conflicts:
	client/angular/api/api-service-facebookService.coffee
	client/angular/api/api-service-facebookService.js
	client/angular/api/api.coffee
	client/angular/api/api.js
	client/angular/filters.coffee
	client/angular/filters.js
Merge branch 'master' of https://github.com/nawlbergs/seed

Conflicts:
	client/angular/api/api-service-facebookService.coffee
	client/angular/api/api-service-facebookService.js
	client/angular/api/api.coffee
	client/angular/api/api.js
	client/angular/filters.coffee
	client/angular/filters.js
Merge branch 'master' of https://github.com/nawlbergs/seed

Conflicts:
	client/angular/api/api-service-facebookService.coffee
	client/angular/api/api-service-facebookService.js
	client/angular/api/api.coffee
	client/angular/api/api.js
	client/angular/filters.coffee
	client/angular/filters.js