Add Mappings screen
Add name to mappings
Add loading of json mapping file
Merge branch 'master' into load_json_from_file

Conflicts:
	Assets/data/mappings/mapping1.json
Add check for existing sensor
Don't load default mapping file
Merge pull request #11 from adamjberg/load_json_from_file

Load json from file