Merge cordovasim into aerogear repository with history