Merge remote-tracking branch 'origin/smartphone' into smartphone
Merge branch 'smartphone' of
https://github.com/fapereira1/make-a-wish.git into smartphone