Added EditComment to the XML
Merge branch 'bradley'
Add bad activity test
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
nsafda