Merge remote-tracking branch 'upstream/master' into feature/dump-mesh-on-failure

.gitmodules

CHANGELOG.md

VERSION

docs/CMakeLists.txt

docs/developer-guide

docs/developer-guide/CMakeLists.txt

docs/developer-guide/coding-standard/coding-standard.tex

docs/developer-guide/core-concepts/core-concepts.tex

...veloper-guide/data-structures-algorithms/connectivity.tex

...data-structures-algorithms/data-structures-algorithms.tex

...oper-guide/data-structures-algorithms/preconditioners.tex

...per-guide/data-structures-algorithms/time-integration.tex

docs/developer-guide/developer-guide.tex

docs/developer-guide/img/icon-blue.png

docs/developer-guide/library-design/img/LocalRegions.png

docs/developer-guide/library-design/img/MultiRegions.png

docs/developer-guide/library-design/img/Quasi3d.png

docs/developer-guide/library-design/img/SpatialDomains.png

docs/developer-guide/library-design/img/StdRegions.png

docs/developer-guide/library-design/img/architecture.eps