Wrong branch commit
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14 into Database
Final Changes according to issues no. #173, #168 and #167
Merge pull request #175 from Saftophobia/FinalDatabase

Final database