merged android studio build into main mfdpaycalculator git