Slightly cleverer debug tasks

…and some placeholders for later beta and production tasks
Reorganized tasks
An after_prepare hook to copy the icons to the platforms location
Some basic hooks to copy things around
conflict resolution
icon.js typo
Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into better-automation
Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into better-automation
Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into better-automation
Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into better-automation
Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into better-automation
Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into better-automation
Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into better-automation
Some gitignore for new plugins files

And removing the versionName from the re/configs version of AndroidManifest.xml now that it will be overwritten from config.xml
Merge pull request #295 from SpiderOak/better-automation

Better automation