First commit. Latest version of the app included.
Merge commit 'c0984864a1e169a7df2ba2aa08e7613e9119d721'