First commit
Merge https://github.com/timbillstrom/Unika-Butiker-Android