timob-14899: Updated manifest permissions
Merge pull request #19 from hieupham007/timob-14899

timob-14899: Updated manifest permissions
[TIDOC-1341] Fix doc bugs causing doc build scripts to break
Merge pull request #20 from bhatfield/tidoc-1341

[TIDOC-1341] Fix doc bugs causing doc build scripts to break
Merge branch 'master' of github.com:appcelerator-modules/ti.map into MOD-1523

Conflicts:
	apidoc/View.yml