fixed androidverision
mergeconflict
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into develop