work in progress
Cenote refactoring completed.
Refactoring finished.
Merge branch 'angular-refactoring' into gh-pages