Merge branch 'master' into working
Merge branch 'working'
Merge branch 'gh-pages'
Working On Android Issues

Sept 10, 2013
Merge branch 'master' into gh-pages