Merge pull request #168 from kronbichler/master

Fix TrilinosWrappers::SparseMatrix::add(factor, other_matrix).
Remove stray Id tag from svn from all headers