Merge pull request #680 from Bars107/master

Updated sherpafy functionality. UI and functionality improvements.
Update sherpafy
Fix activities
Fix small activities
Fix issue
Update screens
Refactor activities
Refactor activities
Fix small bugs
Finalize
Finalize
Update sherpafy activities
Finalize
fixed null reference on selecting same stage. fixed null reference when rotating phone during change stage opration
moved loading from settings to my current place button