adding some buttons and styles to the sample html5 experiment files
using the website as a landing page for the OPrime library for android market
making it possible to use the video recorder intent
making it into a non-library project for release
ignoring copied files in the assets folder
added error checking if language is not speciefied, use english as default, and modifed extra to take stimuli since we will b e supporting audio soon
Added more contants from the old story book experiemnt
formatted and added constructor for audio id
Formatting and using stimuli array rather htan individual arrays of images and audio so we can gather touch points
removed duplicates, now using the story book from the oprime library direclty, requires importing oprime to run the app
working on playing sound in the story book experiment
not turning on replication if replication is already running
added ability to open data uris by saving to disk and a share intent

Conflicts:
	OPrime-Android/src/ca/ilanguage/oprime/content/JavaScriptInterface.java
Merge branch 'master' into release
grunt-init tutorial project
added setup script for tutorial
upgraded to 2013 eclipse project
moving packages around to iosched 2013
Merge branch 'origin/master'

Conflicts:
	OPrime-Android/src/ca/ilanguage/oprime/content/Stimulus.java
	OPrime-Android/src/ca/ilanguage/oprime/storybook/StoryBookSubExperiment.java
updated references