fixes #3064 - links to nested hostgroups use hostgroup_fullname
removing PO merge from commit when doing locale:find

Since we are using transifex.com for pulling translations, commiting merged
PO files only pollutes git. We already do not commit that when using
locale/Makefile, thus making the same change here.
i18n - extracting new, updating rails, pulling from tx
Bump version to 1.3-develop
fixes #3087 - fix space before parenthesis warning
fixes #3088 - Add checkbox to select thin or thick provision for vSphere volumes
fixes #3071 - OS edit failed on foreign keys since config_template_id was '0' on blank
fixes #3090 - new puppetclass creation fails when adding smart variable
fixes #3097 - foreign key error on deleting trend
Fixes #2586 - Revert "Refs #2002 - Fog quick hack"

This reverts commit d37be454fa99c808acf7a89507ee6fd714f139de.
The original commit is not needed becase fog was upgraded.
fixes #3093 - invalid data for a subnet address or mask returns "is invalid and is invalid"
fixes #2764 - settings defined in settings.yaml file are now read-only
fixes #3094 - reports search includes hostgroup and hostgroup_fullname
fixes #3095 - for new trend, disable input of trend_name if not FactTrend
fixes #3072 Vmware: error listing VMs
fixes #3110 Association of vSphere VMs fails
fixes #3089 - Updating settings causes settings page to load again within the page
fixes #3116 - add NIC selection for vSphere: E1000 and VMXNET 3
Fixes #2984 - API v1/v2 StatisticsController and remove JSON from UI controller
fixes #3123 vSphere VM info misses MAC address and displays memory in bytes