added button
replaced button with interactive text
new folder with testapp name changed to 'main' for android
Merge branch 'master' into develop