Merge branch 'master' into develop
Added more todos
Added working percentage conversion, but needs heavy refactoring
Moved maxScrollAmount function
Merge branch 'develop'