Merge branch 'release/merge_with_master'
change to 1 day default
remove mainpage url
Merge branch 'master' into develop