Creating template
Resolving merge conflicts in favor of origin/master
Merge branch 'trunk'
Merge branch 'trunk'
Creating template
chaning to OpenShift PHP
adding health font scaling