Merge branch 'master' of https://github.com/futures/fcrepo4 into master-aic
Merge branch 'master-aic' of https://github.com/nikhiltri/fcrepo4 into master-aic
Added author for checkstyle.
Resolved merge conflicts.
Merge branch 'master' into master-aic
Merge branch 'master-aic' of https://github.com/nikhiltri/fcrepo4 into master-aic
Resolved merge conflicts.
Moved aic:meta child node definition from aic:resource to fedora:resource.
Added web.xml with pre-defined user groups.
Merge pull request #3 from scossu/master-aic

Master aic