rapidftr/tracker#218 @andreweskeclarke @austiine04 fixed audio activity bug
Merge pull request #177 from andreweskeclarke/master

rapidftr/tracker#218 @andreweskeclarke @austiine04 fixed audio activity ...
Merge branch 'master' of github.com:rapidftr/RapidFTR-Android

Conflicts:
	RapidFTR-Android/src/main/java/com/rapidftr/model/BaseModel.java