Merge and fix conflicts

Merges [#2](https://github.com/isotope11/client_app/pull/2) and resolves conflicts.