Merge branch 'rebased' into wordpress

git-svn-id: http://plugins.svn.wordpress.org/wp-photonav/trunk@675335 b8457f37-d9ea-0310-8a92-e5e31aec5664
Release 1.0.1

git-svn-id: http://plugins.svn.wordpress.org/wp-photonav/trunk@675336 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'wordpress' of github.com:fmos/wp-photonav into wordpress