Deleted trigger.io settings files from git
HR android module: upload data to Fluxtream server
Merge branch 'development' into android-dev

Conflicts:
	fluxtreamcapture/src/config.json
Re-adding missing config.json and adding local_config.json to .gitignore
Merge branch 'development' into android-dev

Conflicts:
	fluxtreamcapture/src/config.json
Re-adding missing config.json and adding local_config.json to .gitignore
Merge branch 'development' into android-dev

Conflicts:
	fluxtreamcapture/src/config.json