Added ASL 2.0 header to new file comment
Removed @author from type comments
Added Mockito Matchers to favourite static members