Merge pull request #1 from iLanguage/master

Merge pull request #28 from MarquisAlx/master
Merge pull request #1 from cesine/master

Updates to montage client, and android tutorial
added assets files for sails, modified code to run sails
corrected typo
made possible to proceed to the next test block after one is completed
play audio is delayed by 2 seconds by default
something is wrong with the range controllers
bringing in chrome sandbox support
Merge branch 'master' of github.com:hisakonog/OPrime into tcpp

Conflicts:
	OPrime-HTML5/montage-client/assets
	OPrime-HTML5/montage-client/ui/experiment.reel/experiment.js
Merge branch 'tcpp'
cant use confirm in a chrome app
seem to need the full path with node modules TODO verify this
using https
making header grey again so we can see it
atempting to avoid net::ERR_FILE_NOT_FOUND
adding cordova tests
removing jasmin favicon
jshint
copyo
loading localization xhr fails on android