Merge remote-tracking branch 'origin/master' into 1.0-release-branch
#59 Changed the version name 1.0.0-beta1 to 1.0.
Merge branch '1.0-release-branch' of https://github.com/crunchersaspire/worshipsongs into 1.0-release-branch
#61 Update about html file.
#62 Preparing to release 1.0.1
#63 Resolved conflict
Merge branch '1.0-release-branch'