renamed controller(s) and view(s) to singular
renamed views to view
Merge pull request #167 from panique/develop

Develop