merged with trunk

README.txt

@@ -0,0 +1,20 @@
+OpenLP 2.0
+==========
+
+You're probably reading this because you've just downloaded the source code for
+OpenLP 2.0. If you are looking for the installer file, please go to the download
+page on the web site::
+
+    http://openlp.org/en/download.html
+
+If you're looking for how to contribute to OpenLP, then please look at the
+contribution page on the web site::
+
+    http://openlp.org/en/documentation/introduction/contributing.html
+
+If you've looked at that page, and are wanting to help develop, test or
+translate OpenLP, have a look at the OpenLP wiki::
+
+    http://wiki.openlp.org/
+
+Thanks for downloading OpenLP 2.0!

openlp/plugins/songs/lib/cclifileimport.py

@@ -199,8 +199,11 @@ class CCLIFileImport(SongImport):
         if len(author_list) < 2:
             author_list = song_author.split(u'|')
         for author in author_list:
-            seperated = author.split(u',')
-            self.add_author(seperated[1].strip() + u' ' + seperated[0].strip())
+            separated = author.split(u',')
+            if len(separated) > 1:
+                self.add_author(u' '.join(reversed(separated)))
+            else:
+                self.add_author(author)
         self.title = song_name
         self.copyright = song_copyright
         self.ccli_number = song_ccli