Always roll back changes made to conf by tests
Improvements to DB settings implementation
Legal pages
Markup app improvements