+ add androidManifestFileAlias as alias for androidManifestFile to avoid relocating manifest file in IDEA IDE which recognize androidManifestFile configutatuion
+ add alias also for resources and assets location
Merge branch 'pull_androidManifestAlias'

Conflicts:
	src/main/java/com/jayway/maven/plugins/android/AbstractAndroidMojo.java