Changed directory where sample app is created
Changed Manifest description, button placement
Latest compilation; merge conflict fixed