Edited functions.php constructor
Merge branch 'test'

merging the android framework
Changes prompted Safaricom Appwiz