switched to universal filepicker, https://github.com/kobotoolbox/enketo-express/issues/9
do a bower install when building in Travis
Merge branch 'master' of https://github.com/enketo/enketo into production

Conflicts resolved:
	.gitmodules
	src/js/require-build-config.js
	src/js/require-config.js