router.js bug resolved
Merge pull request #13 from digitalgreenorg/coco_urlfix_enablemonth

router.js bug resolved
main.js generated
Merge branch 'coco_urlfix_enablemonth' into resolve_conflict

Conflicts:
	coco/dist/scripts/main.js
Merge pull request #15 from digitalgreenorg/resolve_conflict

Resolve conflict
Merge branch 'master' of git://github.com/digitalgreenorg/coco into test_coco_13jan14

Conflicts:
	dg/media/coco/coco/app/scripts/router.js
	dg/media/coco/coco/dist/scripts/main.js