Modularized and added configuration via the DOM.
Merge branch 'feature/custom-timeouts' into develop
Merge branch 'develop'