fixed manifest to better handle manifest merging
Merge branch 'master' of github.com:commonsguy/cwac-merge

Conflicts:
	README.markdown
	merge/AndroidManifest.xml