before merge
just a commit
Merge remote-tracking branch 'origin/master'
implemented audioplayermodalview
Merge remote-tracking branch 'MTCasper/master'
fixed several different warnings