Update master with all the changes on develop over the last years#56

ubuntudroid wants to merge 9 commits intostanwood:masterstanwood/framework-network-android:masterfrom

whisp-internet:developwhisp-internet/framework-network-android:developCopy head branch name to clipboard