Merge pull request #13 from chrisprom/master

flatten users json, remove archon-nouveau template, and edit accession list
Merge pull request #14 from chrisprom/master

move subject sources and subject types to enums
Update collection.inc.php

Fixing a typo that broke EAD exports which include multiple digital content entries by making them invalid xml through improper attribute construction.
Merge pull request #15 from jeffnm/patch-1

Update collection.inc.php
Merge pull request #16 from chrisprom/master

flatten subjects json and change to batch_start
Accessions Collections DigitalContent
Merge pull request #17 from mindking/3a3dc95d6445d1b255045d87873c398dfda1f130

Fixes JSON output for collections, accessions, digital content