mergeMerge branch 'develop' of https://github.com/agile-geoscience/modelr
merging beta release development
Merge branch 'beta' of https://github.com/agile-geoscience/modelr
version increasing for release
added server timeout
Merge branch 'master' into develop