halfway point of merge
merge finished
Completely merged Steph's Android branch with master