Some updates to stuff on the activity stuff
Merge branch 'develop' of github.com:ActivityRez/ar-framework into develop