up
Merge branch 'master' of https://github.com/Nico924/fitforfat

Conflicts:
	www/js/controllers/tracking.js