Merge branch 'feature-assets'

git-svn-id: http://plugins.svn.wordpress.org/spacewatch/trunk@859096 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'feature-assets'

git-svn-id: http://plugins.svn.wordpress.org/spacewatch/trunk@859097 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'feature-assets'

git-svn-id: http://plugins.svn.wordpress.org/spacewatch/trunk@859098 b8457f37-d9ea-0310-8a92-e5e31aec5664