1.2.14 final commit

git-svn-id: https://plugins.svn.wordpress.org/iwp-client/trunk@921578 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of https://github.com/wp-plugins/iwp-client into develop

Conflicts:
	init.php