Refactoring of the code. Resizing 2nd db of images
Merge branch 'develop'

Conflicts:
	emotion_labels_full.mat