remax14-48 Displaying any size image on thumbnail design
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/styles/main.css