Merge branch 'master' of https://github.com/vikingco/citylife-wp-plugin

From: Tom Claus <mail@tomclaus.be>

git-svn-id: https://plugins.svn.wordpress.org/citylife/trunk@753416 b8457f37-d9ea-0310-8a92-e5e31aec5664