working on receiving
Completed list from Viper, publicized in VMCntrl
Completed file list

Pushes list of images to public variable fileList<Array> inside
ViperMediaScreen
Merge pull request #13 from adamjberg/David

David
Merge remote-tracking branch 'origin/Justin-oscfilenames'

Conflicts:
	Assets/data/mappings/mapping1.json
Merge branch 'master' of https://github.com/adamjberg/RIME
Make dynamicParameters and object not array

The code expects this as an object and not an array.  This was
breaking sensor mappings
Remove flooding logs
Add different path for desktop platform mappings
Merge pull request #14 from adamjberg/minor_mapping_fixes

Minor mapping fixes
Add a none mapping option

This allows the user to detach a mapping from an object
Move Gesture recognition to perform section
Merge pull request #15 from adamjberg/move_gesture_recognition_to_perform

Move gesture recognition to perform
Add vibrate when gesture is detected

I've also changed the popup to quickly show the detected
gesture and then to hide.
Remove media id from Mapping when Media is deleted
Merge pull request #16 from adamjberg/vibrate_on_successful_gesture

Add vibrate when gesture is detected
Merge pull request #17 from adamjberg/remove_mapping_when_media_deleted

Remove media id from Mapping when Media is deleted
Add type, xPos, yPos to media create
Merge pull request #18 from adamjberg/more_media_control

Add type, xPos, yPos to media create
Comments & such & Removed ViperMessage

ViperMessage I created, wasn't necessary after working on the request
from Viper.