AndroidManifest.xml conflict fix
Merge branch 'master' of github.com:gdgturkiye/add2013-android