Merge pull request #21 from appcelerator-modules/master

[TIMODOPEN-317] Merging master into stable
[TIDOC-1374] Replace non-ascii characters
Merge pull request #23 from bhatfield/tidoc-1374

[TIDOC-1374] Replace non-ascii characters