Added floristics, changed services-footer
Merge branch 'master' into internet
minor fix
Merge branch 'master' into internet