"Undo" of commit 56d518a because of broken calculations
Removed Ping function from setup controller
Updated setup files for versioning
Merge branch 'master' into development
(Reverted 56d518a + setup versioning updates)