errors in d3 library, removing it
moving source files to the main game because android cannot use assets from library files. we will compile the sails standalone app from the main game
set up sails to be called from the main game app
build scripts for sails are ready
tested SAILs as indepentant app with new builders, its working
Merge branch 'old' into testmergeold

Conflicts:
	AndroidManifest.xml
	assets/img/icon128.png
	assets/img/icon16.png
	assets/img/icon48.png
	assets/public/manifest.json
	docs/WhitePaper.pdf
	docs/WhitePaper.tex
	locales/en/messages.json
	locales/fr/messages.json
	project.properties
	scripts/compile_app.sh
	scripts/compile_handlebars.sh
	src/com/github/childphonologylabmcgill/android/sails/SAILSActivity.java