Merging and upgrading done

QSFinance is now upgraded.