Refactoring controller and factory
Merge branch 'master' of https://github.com/fitstats/fitstats
Refactored factories-controller method sharing
Merge pull request #22 from celineotter/master

Refactoring within controller and factory desktop directory
Merge branch 'master' of https://github.com/fitstats/fitstats into feat/stats

Conflicts:
	client/app/dashboard/dashboard.controller.js