third comment
Merge branch 'DEV'
First test version of APP