Merge branch 'hotfix/20140126'
Add virtual destructor to SolverInterface
Rename
Merge branch 'hotfix/20140127' into develop