add unwrap method in baseService.scala
add changes from subtree development
add changes from subtree development
refactor pages to use templateformat
add fullwide template
merge from upstream