Merged iOS and Android

iOS and Android versions now run from same core www folder.