Merge branch 'master' into nike
Merge branch 'nike' into unstable
commented out the status update on the fitbit and nike service pages
Merge branch 'unstable' of github.com:sociam/indx into unstable