assets java jpg ios
merge 
ios final update images.jpg
scale btn's
Merge remote-tracking branch 'origin/Rianne' into Abby