My Gallery Images on Modal Window design
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/modals/gallery-modal.html
My Gallery Images on Modal Window design
My Gallery Images on Modal Window design
Merge remote-tracking branch 'origin/master'