dump
Merge branch 'master' of https://github.com/Pandra/retail-piquadro-ios

Conflicts:
	piquadro/restoreData/data.sqlite
	piquadro/restoreData/data.sqlite-shm
	piquadro/restoreData/data.sqlite-wal