Line ending change?
Merge branch 'develop'

Conflicts:
	views/meta-box.php
Line ending change?
Merge pull request #15 from senlin/develop

add post_id to $marker_options
WordPress Coding Standards optimizations.
WordPress Coding Standards optimizations.
Merge branch 'release/2.2.5'

Conflicts:
	classes/Pronamic/Google/Maps/Info.php
	classes/Pronamic/Google/Maps/Site.php
	css/admin.css
	js/admin.js
	views/page-general.php
	views/page-geocoder.php
	views/uninstall-form.php
updated slug for the Settings link on the Plugin page. Was going to the incorrect location
incorrect admin url. Now using admin.php correctly.
fix geocoding problem. Removed the https call, the geocode Query Args now looks for GEOCODE_STATUS where not set. Deleted the post meta when the lat/lng are empty.
Added Serbo-Croatian language by Borisa Djuraskovic (Web Hosting Hub).
WordPress Coding Standards optimizations.
Fixed var name use.
Added support for Shopp products page.
Version bump to 2.2.6.
Merge branch 'release/2.2.6'
Fixed error on saving settings:

Uninitialized string offset: 0 in /wp-content/plugins/pronamic-google-maps/classes/Pronamic/Google/Maps/Settings.php on line 157
Improved support for percent sizes.
Version bump up to 2.2.7.
Merge branch 'release/2.2.7'