Merge branch 'master' into require
working require
adding some more android platform files
merge master to require