added support for multiple source folders
Merge branch 'master' of https://github.com/kedzie/maven-android-plugin into 208
code style fixes
platform tool and level commissioning
reverting back to sdk 21.1 for now on ci server, no time to figure out commissioning atm
changing to platform 16 in test mocks to limit need for platforms on ci server
Merge remote-tracking branch 'parent/master' into feature-force-jumbo
use maven central manifestmerger