Added Junits; testing pushing through Netbeans
Added junits for Archive.updateEvents()
Merge conflict fixes
Merge pull request #49 from vcnickerson/Ian/active

Ian/active