resolve merge conflicts
resolve merge conflicts

sampsasaarela/NativeBase,chaitanya0bhagvan/NativeBase,GeekyAnts/NativeBase,GeekyAnts/NativeBase,GeekyAnts/NativeBase,GeekyAnts/NativeBase,GeekyAnts/NativeBase