Introduced a platform manager that is able to deal with cross platform settings for android and hotspot based jvm's
Merge remote-tracking branch 'origin/master'