Merge branch 'master' into develop
reorganized views
Adding taxonomy terms
Merge branch 'develop' into master