minor fixes and emporiums
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2
Code refactoring in WebApp