resizePictures, deletePictures (local)
Merge remote-tracking branch 'hellman/master'
Merge branch 'master' into maqueteo

Conflicts:
	public/default_pictures/budget.png
	public/default_pictures/quantup.png