swf path corrected
main.js generated
Merge branch 'coco_export_excel' into conflict_resolve

Conflicts:
	coco/dist/scripts/main.js
Merge pull request #16 from digitalgreenorg/conflict_resolve

Conflict resolve
Merge branch 'master' of git://github.com/digitalgreenorg/coco into test_coco_13jan14

Conflicts:
	dg/templates/coco/coco/app/scripts/views/list.js
	dg/templates/coco/coco/dist/scripts/main.js