Merge branch 'master' of github.com:extension/aae
Merge branch 'remove_newrelic'
Make Last Active Time Only Show Days Ago and Consolidate Code for it in Application Helper
Missed Underscores and Rename Method
Merge branch 'last_active_tweak' into development