fixed labels for activity pickup times
Merge branch 'develop' of github.com:ActivityRez/ar-framework into activity-times
[finishes #83813454] fixed labels for activity pickup times
me and hiro were both working on the same thing. this is good now
Merge pull request #93 from ActivityRez/82778100

small fix to help dashboard load if company name is an int
changed ons to data-binds made all that stuff work
Merge branch 'develop' of github.com:ActivityRez/ar-framework into fix-slideshow
Merge pull request #94 from ActivityRez/fix-slideshow

Fix activity preview slideshow
Merge pull request #92 from ActivityRez/activity-times

Activity times
media manager has a return to media library button if in the upload
Merge branch 'develop' of github.com:ActivityRez/ar-framework into 82778100