Merge pull request #37 from janm399/master

Big renaming completed. Close #36.
Merge pull request #38 from janm399/master

Recognition webapp complete.