Support for android-gradle-plugin 0.11
use the new manifest merger introduced in android-gradle-plugin 0.11 by default
Merge branch 'develop' into feature/android-studio-0.6

Conflicts:
	build.gradle
Merge pull request #1483 from wordpress-mobile/feature/android-studio-0.6

Feature/android studio 0.6